diff options
| author | Segher Boessenkool <segher@kernel.crashing.org> | 2007-08-02 01:41:14 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-03 19:36:01 +1000 |
| commit | 5628244059976009151d41c2798855290753d8d5 (patch) | |
| tree | ec7132190a3518ecd7cd335b5f297b90c7ea99c2 /arch | |
| parent | 3a77d291be53fbc619f14a6199b9b4cac036c476 (diff) | |
| download | blackbird-op-linux-5628244059976009151d41c2798855290753d8d5.tar.gz blackbird-op-linux-5628244059976009151d41c2798855290753d8d5.zip | |
[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) if (value) { if (pci_device_from_OF_node(node, &pbus, &pid) == 0) - pdev = pci_find_slot(pbus, pid); + pdev = pci_get_bus_and_slot(pbus, pid); if (pdev == NULL) return 0; rc = pci_enable_device(pdev); + if (rc == 0) + pci_set_master(pdev); + pci_dev_put(pdev); if (rc) return rc; - pci_set_master(pdev); } return 0; } |
