From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Date: Fri, 07 Sep 2018 20:07:31 +0000 Subject: Re: [PATCH v2] fbdev: fix kerneldoc Message-Id: <20180907200731.GE7176@phenom.ffwll.local> List-Id: References: <0172c6973edcb3827244d5fc3d0970e6f1fddfd8.1536341619.git.mirq-linux@rere.qmqm.pl> <38ca9044455a33e398b45e0281643cc24da3c2fc.1536342224.git.mirq-linux@rere.qmqm.pl> In-Reply-To: <38ca9044455a33e398b45e0281643cc24da3c2fc.1536342224.git.mirq-linux@rere.qmqm.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= Cc: Daniel Vetter , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz On Fri, Sep 07, 2018 at 07:47:08PM +0200, Michał Mirosław wrote: > As noticed by kbuild test robot , > remove_conflicting_pci_framebuffers()'s second argument > is called res_id not resource_id. Fix this. > > Signed-off-by: Michał Mirosław > --- > * Against drm-misc-next, as that's where original patchset went to. > > v2: include second occurrence of @resource_id Applied, thanks. -Daniel > > --- > drivers/video/fbdev/core/fbmem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c > index 5ffadc8e681d..0da75c55660d 100644 > --- a/drivers/video/fbdev/core/fbmem.c > +++ b/drivers/video/fbdev/core/fbmem.c > @@ -1834,11 +1834,11 @@ EXPORT_SYMBOL(remove_conflicting_framebuffers); > /** > * remove_conflicting_pci_framebuffers - remove firmware-configured framebuffers for PCI devices > * @pdev: PCI device > - * @resource_id: index of PCI BAR configuring framebuffer memory > + * @res_id: index of PCI BAR configuring framebuffer memory > * @name: requesting driver name > * > * This function removes framebuffer devices (eg. initialized by firmware) > - * using memory range configured for @pdev's BAR @resource_id. > + * using memory range configured for @pdev's BAR @res_id. > * > * The function assumes that PCI device with shadowed ROM drives a primary > * display and so kicks out vga16fb. > -- > 2.18.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2] fbdev: fix kerneldoc Date: Fri, 7 Sep 2018 22:07:31 +0200 Message-ID: <20180907200731.GE7176@phenom.ffwll.local> References: <0172c6973edcb3827244d5fc3d0970e6f1fddfd8.1536341619.git.mirq-linux@rere.qmqm.pl> <38ca9044455a33e398b45e0281643cc24da3c2fc.1536342224.git.mirq-linux@rere.qmqm.pl> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F8246E196 for ; Fri, 7 Sep 2018 20:07:35 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id p52-v6so12319007eda.12 for ; Fri, 07 Sep 2018 13:07:35 -0700 (PDT) Content-Disposition: inline In-Reply-To: <38ca9044455a33e398b45e0281643cc24da3c2fc.1536342224.git.mirq-linux@rere.qmqm.pl> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= Cc: Daniel Vetter , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBTZXAgMDcsIDIwMTggYXQgMDc6NDc6MDhQTSArMDIwMCwgTWljaGHFgiBNaXJvc8WC YXcgd3JvdGU6Cj4gQXMgbm90aWNlZCBieSBrYnVpbGQgdGVzdCByb2JvdCA8bGtwQGludGVsLmNv bT4sCj4gcmVtb3ZlX2NvbmZsaWN0aW5nX3BjaV9mcmFtZWJ1ZmZlcnMoKSdzIHNlY29uZCBhcmd1 bWVudAo+IGlzIGNhbGxlZCByZXNfaWQgbm90IHJlc291cmNlX2lkLiBGaXggdGhpcy4KPiAKPiBT aWduZWQtb2ZmLWJ5OiBNaWNoYcWCIE1pcm9zxYJhdyA8bWlycS1saW51eEByZXJlLnFtcW0ucGw+ Cj4gLS0tCj4gKiBBZ2FpbnN0IGRybS1taXNjLW5leHQsIGFzIHRoYXQncyB3aGVyZSBvcmlnaW5h bCBwYXRjaHNldCB3ZW50IHRvLgo+IAo+IHYyOiBpbmNsdWRlIHNlY29uZCBvY2N1cnJlbmNlIG9m IEByZXNvdXJjZV9pZAoKQXBwbGllZCwgdGhhbmtzLgotRGFuaWVsCgo+IAo+IC0tLQo+ICBkcml2 ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtZW0uYyB8IDQgKystLQo+ICAxIGZpbGUgY2hhbmdlZCwg MiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L3ZpZGVvL2ZiZGV2L2NvcmUvZmJtZW0uYyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1l bS5jCj4gaW5kZXggNWZmYWRjOGU2ODFkLi4wZGE3NWM1NTY2MGQgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy92aWRlby9mYmRldi9jb3JlL2ZibWVtLmMKPiArKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2 L2NvcmUvZmJtZW0uYwo+IEBAIC0xODM0LDExICsxODM0LDExIEBAIEVYUE9SVF9TWU1CT0wocmVt b3ZlX2NvbmZsaWN0aW5nX2ZyYW1lYnVmZmVycyk7Cj4gIC8qKgo+ICAgKiByZW1vdmVfY29uZmxp Y3RpbmdfcGNpX2ZyYW1lYnVmZmVycyAtIHJlbW92ZSBmaXJtd2FyZS1jb25maWd1cmVkIGZyYW1l YnVmZmVycyBmb3IgUENJIGRldmljZXMKPiAgICogQHBkZXY6IFBDSSBkZXZpY2UKPiAtICogQHJl c291cmNlX2lkOiBpbmRleCBvZiBQQ0kgQkFSIGNvbmZpZ3VyaW5nIGZyYW1lYnVmZmVyIG1lbW9y eQo+ICsgKiBAcmVzX2lkOiBpbmRleCBvZiBQQ0kgQkFSIGNvbmZpZ3VyaW5nIGZyYW1lYnVmZmVy IG1lbW9yeQo+ICAgKiBAbmFtZTogcmVxdWVzdGluZyBkcml2ZXIgbmFtZQo+ICAgKgo+ICAgKiBU aGlzIGZ1bmN0aW9uIHJlbW92ZXMgZnJhbWVidWZmZXIgZGV2aWNlcyAoZWcuIGluaXRpYWxpemVk IGJ5IGZpcm13YXJlKQo+IC0gKiB1c2luZyBtZW1vcnkgcmFuZ2UgY29uZmlndXJlZCBmb3IgQHBk ZXYncyBCQVIgQHJlc291cmNlX2lkLgo+ICsgKiB1c2luZyBtZW1vcnkgcmFuZ2UgY29uZmlndXJl ZCBmb3IgQHBkZXYncyBCQVIgQHJlc19pZC4KPiAgICoKPiAgICogVGhlIGZ1bmN0aW9uIGFzc3Vt ZXMgdGhhdCBQQ0kgZGV2aWNlIHdpdGggc2hhZG93ZWQgUk9NIGRyaXZlcyBhIHByaW1hcnkKPiAg ICogZGlzcGxheSBhbmQgc28ga2lja3Mgb3V0IHZnYTE2ZmIuCj4gLS0gCj4gMi4xOC4wCj4gCgot LSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0 cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg==