diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-07-16 02:40:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:42 -0400 |
commit | 1b28f22a87a5a2f0ab39f2549441bbe5eb2e369f (patch) | |
tree | effb6deed0633d277ac0a0f3a79e3a0cf58ca61a | |
parent | c1fbac447993b275f90e118826a5edca1ec508da (diff) |
edd: switch to pci_get based API
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/firmware/edd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c index 15232271d848..0fb730ee1da8 100644 --- a/drivers/firmware/edd.c +++ b/drivers/firmware/edd.c | |||
@@ -669,7 +669,7 @@ edd_get_pci_dev(struct edd_device *edev) | |||
669 | struct edd_info *info = edd_dev_get_info(edev); | 669 | struct edd_info *info = edd_dev_get_info(edev); |
670 | 670 | ||
671 | if (edd_dev_is_type(edev, "PCI")) { | 671 | if (edd_dev_is_type(edev, "PCI")) { |
672 | return pci_find_slot(info->params.interface_path.pci.bus, | 672 | return pci_get_bus_and_slot(info->params.interface_path.pci.bus, |
673 | PCI_DEVFN(info->params.interface_path.pci.slot, | 673 | PCI_DEVFN(info->params.interface_path.pci.slot, |
674 | info->params.interface_path.pci. | 674 | info->params.interface_path.pci. |
675 | function)); | 675 | function)); |
@@ -682,9 +682,12 @@ edd_create_symlink_to_pcidev(struct edd_device *edev) | |||
682 | { | 682 | { |
683 | 683 | ||
684 | struct pci_dev *pci_dev = edd_get_pci_dev(edev); | 684 | struct pci_dev *pci_dev = edd_get_pci_dev(edev); |
685 | int ret; | ||
685 | if (!pci_dev) | 686 | if (!pci_dev) |
686 | return 1; | 687 | return 1; |
687 | return sysfs_create_link(&edev->kobj,&pci_dev->dev.kobj,"pci_dev"); | 688 | ret = sysfs_create_link(&edev->kobj,&pci_dev->dev.kobj,"pci_dev"); |
689 | pci_dev_put(pci_dev); | ||
690 | return ret; | ||
688 | } | 691 | } |
689 | 692 | ||
690 | static inline void | 693 | static inline void |