summaryrefslogtreecommitdiff
path: root/drivers/isdn/hisax/avm_pci.c
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2010-01-18 19:24:10 +0300
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-02-23 03:17:01 +0300
commit41a68a748bbc61f5bcea999e33ba72926dfbe6f7 (patch)
treed6b100c49d847270c235a9788b0bebb9372bcec9 /drivers/isdn/hisax/avm_pci.c
parent7c9342b8dd1a32386fc32bffb9eedebbfe264763 (diff)
downloadlinux-41a68a748bbc61f5bcea999e33ba72926dfbe6f7.tar.xz
PCI: push deprecated pci_find_device() function to last user
The ISDN4Linux HiSax driver family contains the last remaining users of the deprecated pci_find_device() function. This patch creates a private copy of that function in HiSax, and removes the now unused global function together with its controlling configuration option, CONFIG_PCI_LEGACY. Signed-off-by: Tilman Schmidt <tilman@imap.cc> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/isdn/hisax/avm_pci.c')
-rw-r--r--drivers/isdn/hisax/avm_pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 7cabc5a19492..14295a155e71 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -822,7 +822,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs)
#endif /* __ISAPNP__ */
-#ifndef CONFIG_PCI_LEGACY
+#ifndef CONFIG_PCI
static int __devinit avm_pci_setup(struct IsdnCardState *cs)
{
@@ -835,7 +835,7 @@ static struct pci_dev *dev_avm __devinitdata = NULL;
static int __devinit avm_pci_setup(struct IsdnCardState *cs)
{
- if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM,
+ if ((dev_avm = hisax_find_pci_device(PCI_VENDOR_ID_AVM,
PCI_DEVICE_ID_AVM_A1, dev_avm))) {
if (pci_enable_device(dev_avm))
@@ -864,7 +864,7 @@ static int __devinit avm_pci_setup(struct IsdnCardState *cs)
return (1);
}
-#endif /* CONFIG_PCI_LEGACY */
+#endif /* CONFIG_PCI */
int __devinit
setup_avm_pcipnp(struct IsdnCard *card)