On Fri, Sep 07, 2018 at 07:47:08PM +0200, Michał Mirosław wrote: > As noticed by kbuild test robot <lkp@xxxxxxxxx>, > remove_conflicting_pci_framebuffers()'s second argument > is called res_id not resource_id. Fix this. > > Signed-off-by: Michał Mirosław <mirq-linux@xxxxxxxxxxxx> > --- > * 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
