From: Andy Shevchenko Date: Fri, 13 Aug 2021 15:36:19 +0000 (+0300) Subject: PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n X-Git-Tag: v4.19.207~10 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6bdadfff347e42b6da70a9c77bb443479781c1f3;p=users%2Fdwmw2%2Flinux.git PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n [ Upstream commit 817f9916a6e96ae43acdd4e75459ef4f92d96eb1 ] The CONFIG_PCI=y case got a new parameter long time ago. Sync the stub as well. [bhelgaas: add parameter names] Fixes: 725522b5453d ("PCI: add the sysfs driver name to all modules") Link: https://lore.kernel.org/r/20210813153619.89574-1-andriy.shevchenko@linux.intel.com Reported-by: kernel test robot Signed-off-by: Andy Shevchenko Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- diff --git a/include/linux/pci.h b/include/linux/pci.h index 2fda9893962d1..6f9ca2f278b32 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1644,8 +1644,9 @@ static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; } static inline void pci_disable_device(struct pci_dev *dev) { } 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 *drv, + struct module *owner, + const char *mod_name) { return 0; } static inline int pci_register_driver(struct pci_driver *drv) { return 0; }