Skip to contentSkip to conversation

PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n

PATCH Applied Andy Shevchenko 2 participants 2 messages Aug 13, 2021 – Aug 20, 2021 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n

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")
---
 include/linux/pci.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/pci.h +3 -2
index 540b377ca8f6..1ef4ee6a8b2e 100644
@@ -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; }
Signature · 1 line
2.30.2
#1 lore raw
Quoted 6 lines · Andy Shevchenko

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")

Applied to pci/misc for v5.15, thanks!

Quoted 23 lines
---
 include/linux/pci.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/pci.h +3 -2
index 540b377ca8f6..1ef4ee6a8b2e 100644
@@ -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; }
Signature · 1 line
2.30.2