| Message ID | 20210813153619.89574-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1,1/1] PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n | expand |
On Fri, Aug 13, 2021 at 06:36:19PM +0300, Andy Shevchenko wrote: > The CONFIG_PCI=y case got a new parameter long time ago. > Sync the stub as well. > > Fixes: 725522b5453d ("PCI: add the sysfs driver name to all modules") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied to pci/misc for v5.15, thanks! > --- > include/linux/pci.h | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 540b377ca8f6..1ef4ee6a8b2e 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1740,8 +1740,9 @@ static inline void pci_disable_device(struct pci_dev *dev) { } > static inline int pcim_enable_device(struct pci_dev *pdev) { return -EIO; } > static inline int pci_assign_resource(struct pci_dev *dev, int i) > { return -EBUSY; } > -static inline int __pci_register_driver(struct pci_driver *drv, > - struct module *owner) > +static inline int __must_check __pci_register_driver(struct pci_driver *, > + struct module *, > + const char *mod_name) > { return 0; } > static inline int pci_register_driver(struct pci_driver *drv) > { return 0; } > -- > 2.30.2 >
diff --git a/include/linux/pci.h b/include/linux/pci.h index 540b377ca8f6..1ef4ee6a8b2e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1740,8 +1740,9 @@ static inline void pci_disable_device(struct pci_dev *dev) { } static inline int pcim_enable_device(struct pci_dev *pdev) { return -EIO; } static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY; } -static inline int __pci_register_driver(struct pci_driver *drv, - struct module *owner) +static inline int __must_check __pci_register_driver(struct pci_driver *, + struct module *, + const char *mod_name) { return 0; } static inline int pci_register_driver(struct pci_driver *drv) { return 0; }
The CONFIG_PCI=y case got a new parameter long time ago. Sync the stub as well. Fixes: 725522b5453d ("PCI: add the sysfs driver name to all modules") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- include/linux/pci.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)