diff options
author | Segher Boessenkool <segher@kernel.crashing.org> | 2007-08-01 11:41:14 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-08-03 05:36:01 -0400 |
commit | 5628244059976009151d41c2798855290753d8d5 (patch) | |
tree | ec7132190a3518ecd7cd335b5f297b90c7ea99c2 /arch | |
parent | 3a77d291be53fbc619f14a6199b9b4cac036c476 (diff) |
[POWERPC] Fix a compile warning in powermac/feature.c
...by using the pci_get API instead of the deprecated old stuff.
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/powermac/feature.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c index f29705f8047d..ba931be2175c 100644 --- a/arch/powerpc/platforms/powermac/feature.c +++ b/arch/powerpc/platforms/powermac/feature.c | |||
@@ -826,13 +826,15 @@ core99_ata100_enable(struct device_node *node, long value) | |||
826 | 826 | ||
827 | if (value) { | 827 | if (value) { |
828 | if (pci_device_from_OF_node(node, &pbus, &pid) == 0) | 828 | if (pci_device_from_OF_node(node, &pbus, &pid) == 0) |
829 | pdev = pci_find_slot(pbus, pid); | 829 | pdev = pci_get_bus_and_slot(pbus, pid); |
830 | if (pdev == NULL) | 830 | if (pdev == NULL) |
831 | return 0; | 831 | return 0; |
832 | rc = pci_enable_device(pdev); | 832 | rc = pci_enable_device(pdev); |
833 | if (rc == 0) | ||
834 | pci_set_master(pdev); | ||
835 | pci_dev_put(pdev); | ||
833 | if (rc) | 836 | if (rc) |
834 | return rc; | 837 | return rc; |
835 | pci_set_master(pdev); | ||
836 | } | 838 | } |
837 | return 0; | 839 | return 0; |
838 | } | 840 | } |