aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorSinan Kaya <okaya@codeaurora.org>2017-11-22 00:30:56 -0500
committerGuenter Roeck <linux@roeck-us.net>2018-01-02 15:05:34 -0800
commitb9ccff233e5eb1ae6adc831c0aa1f456d0cbc5cb (patch)
tree43c1852db6d6b2be5fec5d691b3532bcb4da1631 /drivers/hwmon
parenthwmon: Drop unnecessary 'default n' from Kconfig (diff)
downloadlinux-dev-b9ccff233e5eb1ae6adc831c0aa1f456d0cbc5cb.tar.xz
linux-dev-b9ccff233e5eb1ae6adc831c0aa1f456d0cbc5cb.zip
hwmon: (coretemp) deprecate pci_get_bus_and_slot()
pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as where a PCI device is present. This restricts the device drivers to be reused for other domain numbers. Use pci_get_domain_bus_and_slot() with a domain number of 0 where we can't extract the domain number. Other places, use the actual domain number from the device. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/coretemp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index c13a4fd86b3c..4bdbf77f7197 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -246,7 +246,8 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
int err;
u32 eax, edx;
int i;
- struct pci_dev *host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
+ u16 devfn = PCI_DEVFN(0, 0);
+ struct pci_dev *host_bridge = pci_get_domain_bus_and_slot(0, 0, devfn);
/*
* Explicit tjmax table entries override heuristics.