LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v1 1/1] PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n
@ 2021-08-13 15:36 Andy Shevchenko
  2021-08-20 22:40 ` Bjorn Helgaas
  0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2021-08-13 15:36 UTC (permalink / raw)
  To: Bjorn Helgaas, linux-pci, linux-kernel; +Cc: Andy Shevchenko, kernel test robot

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

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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v1 1/1] PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n
  2021-08-13 15:36 [PATCH v1 1/1] PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n Andy Shevchenko
@ 2021-08-20 22:40 ` Bjorn Helgaas
  0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2021-08-20 22:40 UTC (permalink / raw)
  To: Andy Shevchenko; +Cc: Bjorn Helgaas, linux-pci, linux-kernel, kernel test robot

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
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-20 22:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-13 15:36 [PATCH v1 1/1] PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n Andy Shevchenko
2021-08-20 22:40 ` Bjorn Helgaas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).