From: Bjorn Helgaas <helgaas@kernel.org>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: linux-pci <linux-pci@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Guenter Roeck <linux@roeck-us.net>,
LKML <linux-kernel@vger.kernel.org>,
Fengguang Wu <fengguang.wu@intel.com>,
Arnd Bergmann <arnd@arndb.de>,
David Woodhouse <dwmw@amazon.co.uk>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Matthew Minter <matt@masarand.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: Re: [PATCH -next] pci: add function stub for pci_get_domain_bus_and_slot()
Date: Wed, 6 Dec 2017 15:02:09 -0600 [thread overview]
Message-ID: <20171206210209.GN23510@bhelgaas-glaptop.roam.corp.google.com> (raw)
In-Reply-To: <20171205203920.GI23510@bhelgaas-glaptop.roam.corp.google.com>
[+cc Arnd, Rafael, Thomas, Matthew, Lorenzo]
On Tue, Dec 05, 2017 at 02:39:20PM -0600, Bjorn Helgaas wrote:
> [+cc Sinan]
>
> On Tue, Nov 28, 2017 at 02:31:21PM -0800, Randy Dunlap wrote:
> > From: Randy Dunlap <rdunlap@infradead.org>
> >
> > The coretemp driver build fails when CONFIG_PCI is not enabled
> > because it uses a function that does not have a stub for that
> > config case, so add the function stub.
> >
> > ../drivers/hwmon/coretemp.c: In function 'adjust_tjmax':
> > ../drivers/hwmon/coretemp.c:250:9: error: implicit declaration of function 'pci_get_domain_bus_and_slot' [-Werror=implicit-function-declaration]
> > struct pci_dev *host_bridge = pci_get_domain_bus_and_slot(0, 0, devfn);
> > ../drivers/hwmon/coretemp.c:250:32: warning: initialization makes pointer from integer without a cast [enabled by default]
> > struct pci_dev *host_bridge = pci_get_domain_bus_and_slot(0, 0, devfn);
> >
> > Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>
> Applied with Guenter's ack to pci/enumeration for v4.16, thanks!
>
> Apparently no other code calls pci_get_domain_bus_and_slot() when
> CONFIG_PCI isn't enabled.
>
> 15ab6790f628 ("hwmon: (coretemp) deprecate pci_get_bus_and_slot()") is
> already in linux-next via hwmon-staging.
>
> The pci tree is merged into next slightly before hwmon-staging, so
> this should be resolved as soon as the 0-day builder builds my
> pci/enumeration branch and I merge it into my next branch.
On Arnd's advice, I moved this to for-linus for v4.15 in case any of
the conversion patches get merged before PCI during the v4.16 merge
window.
> > ---
> > include/linux/pci.h | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > --- linux-next-20171128.orig/include/linux/pci.h
> > +++ linux-next-20171128/include/linux/pci.h
> > @@ -1660,6 +1660,9 @@ static inline struct pci_dev *pci_get_sl
> > static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus,
> > unsigned int devfn)
> > { return NULL; }
> > +static inline struct pci_dev *pci_get_domain_bus_and_slot(int domain,
> > + unsigned int bus, unsigned int devfn)
> > +{ return NULL; }
> >
> > static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
> > static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; }
> >
> >
prev parent reply other threads:[~2017-12-06 21:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-28 22:31 [PATCH -next] pci: add function stub for pci_get_domain_bus_and_slot() Randy Dunlap
2017-11-28 23:17 ` Guenter Roeck
2017-12-05 20:39 ` Bjorn Helgaas
2017-12-05 20:50 ` Sinan Kaya
2017-12-06 21:02 ` 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=20171206210209.GN23510@bhelgaas-glaptop.roam.corp.google.com \
--to=helgaas@kernel.org \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=dwmw@amazon.co.uk \
--cc=fengguang.wu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=lorenzo.pieralisi@arm.com \
--cc=matt@masarand.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rdunlap@infradead.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).