diff options
| author | Alan Cox | 2006-10-03 10:14:35 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-03 17:04:09 +0200 |
| commit | 652aa16291095911640137155063a5c6ea9bad74 (patch) | |
| tree | 6c463c8da82045e9ecdbb1e7e3242c12b4be6bae /drivers/ide/pci/cy82c693.c | |
| parent | [PATCH] Allow ide_generic_all to be used modular and built in (diff) | |
| download | kernel-qcow2-linux-652aa16291095911640137155063a5c6ea9bad74.tar.gz kernel-qcow2-linux-652aa16291095911640137155063a5c6ea9bad74.tar.xz kernel-qcow2-linux-652aa16291095911640137155063a5c6ea9bad74.zip | |
[PATCH] IDE: more pci_find cleanup
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide/pci/cy82c693.c')
| -rw-r--r-- | drivers/ide/pci/cy82c693.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index 120929fbe7a3..64330c459bd4 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c @@ -281,7 +281,7 @@ static void cy82c693_tune_drive (ide_drive_t *drive, u8 pio) /* select primary or secondary channel */ if (hwif->index > 0) { /* drive is on the secondary channel */ - dev = pci_find_slot(dev->bus->number, dev->devfn+1); + dev = pci_get_slot(dev->bus, dev->devfn+1); if (!dev) { printk(KERN_ERR "%s: tune_drive: " "Cannot find secondary interface!\n", @@ -500,8 +500,9 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev Function 1 is primary IDE channel, function 2 - secondary. */ if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && PCI_FUNC(dev->devfn) == 1) { - dev2 = pci_find_slot(dev->bus->number, dev->devfn + 1); + dev2 = pci_get_slot(dev->bus, dev->devfn + 1); ret = ide_setup_pci_devices(dev, dev2, d); + /* We leak pci refs here but thats ok - we can't be unloaded */ } return ret; } |