public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	kernel test robot <lkp@intel.com>
Subject: Re: [PATCH v1 1/1] PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n
Date: Fri, 20 Aug 2021 17:40:12 -0500	[thread overview]
Message-ID: <20210820224012.GA3367853@bjorn-Precision-5520> (raw)
In-Reply-To: <20210813153619.89574-1-andriy.shevchenko@linux.intel.com>

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
> 

      reply	other threads:[~2021-08-20 22:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210820224012.GA3367853@bjorn-Precision-5520 \
    --to=helgaas@kernel.org \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=bhelgaas@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lkp@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox