diff options
| author | Sinan Kaya <okaya@codeaurora.org> | 2017-12-19 00:37:46 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-11 17:29:04 -0600 |
| commit | 8c016394e838a48f4815d820d6589fe8da82fc9d (patch) | |
| tree | 177b6667be13e434f1f93f4987288757c2db7973 /drivers/ide | |
| parent | 2fa6d6cdaf283c05ae23842b2a04aeb223203c13 (diff) | |
| download | linux-stable-8c016394e838a48f4815d820d6589fe8da82fc9d.tar.gz linux-stable-8c016394e838a48f4815d820d6589fe8da82fc9d.tar.bz2 linux-stable-8c016394e838a48f4815d820d6589fe8da82fc9d.zip | |
sl82c105: 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.
Getting ready to remove pci_get_bus_and_slot() function in favor of
pci_get_domain_bus_and_slot().
Replace pci_get_bus_and_slot() with pci_get_domain_bus_and_slot()
and extract the domain number from struct pci_dev.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/sl82c105.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c index 8755df3330a0..3300dac56390 100644 --- a/drivers/ide/sl82c105.c +++ b/drivers/ide/sl82c105.c @@ -239,8 +239,9 @@ static u8 sl82c105_bridge_revision(struct pci_dev *dev) /* * The bridge should be part of the same device, but function 0. */ - bridge = pci_get_bus_and_slot(dev->bus->number, - PCI_DEVFN(PCI_SLOT(dev->devfn), 0)); + bridge = pci_get_domain_bus_and_slot(pci_domain_nr(dev->bus), + dev->bus->number, + PCI_DEVFN(PCI_SLOT(dev->devfn), 0)); if (!bridge) return -1; |