diff options
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2400.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2800.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c index a6f14801872d..9ee63834e603 100644 --- a/arch/arm/mach-ixp2000/ixdp2400.c +++ b/arch/arm/mach-ixp2000/ixdp2400.c | |||
| @@ -133,11 +133,13 @@ static void ixdp2400_pci_postinit(void) | |||
| 133 | struct pci_dev *dev; | 133 | struct pci_dev *dev; |
| 134 | 134 | ||
| 135 | if (ixdp2x00_master_npu()) { | 135 | if (ixdp2x00_master_npu()) { |
| 136 | dev = pci_find_slot(1, IXDP2400_SLAVE_ENET_DEVFN); | 136 | dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN); |
| 137 | pci_remove_bus_device(dev); | 137 | pci_remove_bus_device(dev); |
| 138 | pci_dev_put(dev) | ||
| 138 | } else { | 139 | } else { |
| 139 | dev = pci_find_slot(1, IXDP2400_MASTER_ENET_DEVFN); | 140 | dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN); |
| 140 | pci_remove_bus_device(dev); | 141 | pci_remove_bus_device(dev); |
| 142 | pci_dev_put(dev) | ||
| 141 | 143 | ||
| 142 | ixdp2x00_slave_pci_postinit(); | 144 | ixdp2x00_slave_pci_postinit(); |
| 143 | } | 145 | } |
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c index 91d36d91dac0..70d247f09a7e 100644 --- a/arch/arm/mach-ixp2000/ixdp2800.c +++ b/arch/arm/mach-ixp2000/ixdp2800.c | |||
| @@ -261,14 +261,16 @@ int __init ixdp2800_pci_init(void) | |||
| 261 | 261 | ||
| 262 | pci_common_init(&ixdp2800_pci); | 262 | pci_common_init(&ixdp2800_pci); |
| 263 | if (ixdp2x00_master_npu()) { | 263 | if (ixdp2x00_master_npu()) { |
| 264 | dev = pci_find_slot(1, IXDP2800_SLAVE_ENET_DEVFN); | 264 | dev = pci_get_bus_and_slot(1, IXDP2800_SLAVE_ENET_DEVFN); |
| 265 | pci_remove_bus_device(dev); | 265 | pci_remove_bus_device(dev); |
| 266 | pci_dev_put(dev); | ||
| 266 | 267 | ||
| 267 | ixdp2800_master_enable_slave(); | 268 | ixdp2800_master_enable_slave(); |
| 268 | ixdp2800_master_wait_for_slave_bus_scan(); | 269 | ixdp2800_master_wait_for_slave_bus_scan(); |
| 269 | } else { | 270 | } else { |
| 270 | dev = pci_find_slot(1, IXDP2800_MASTER_ENET_DEVFN); | 271 | dev = pci_get_bus_and_slot(1, IXDP2800_MASTER_ENET_DEVFN); |
| 271 | pci_remove_bus_device(dev); | 272 | pci_remove_bus_device(dev); |
| 273 | pci_dev_put(dev); | ||
| 272 | } | 274 | } |
| 273 | } | 275 | } |
| 274 | 276 | ||
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index af48cb52dfc4..aa2655092d2d 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c | |||
| @@ -241,11 +241,14 @@ void ixdp2x00_slave_pci_postinit(void) | |||
| 241 | /* | 241 | /* |
| 242 | * Remove PMC device is there is one | 242 | * Remove PMC device is there is one |
| 243 | */ | 243 | */ |
| 244 | if((dev = pci_find_slot(1, IXDP2X00_PMC_DEVFN))) | 244 | if((dev = pci_get_bus_and_slot(1, IXDP2X00_PMC_DEVFN))) { |
| 245 | pci_remove_bus_device(dev); | 245 | pci_remove_bus_device(dev); |
| 246 | pci_dev_put(dev); | ||
| 247 | } | ||
| 246 | 248 | ||
| 247 | dev = pci_find_slot(0, IXDP2X00_21555_DEVFN); | 249 | dev = pci_get_bus_and_slot(0, IXDP2X00_21555_DEVFN); |
| 248 | pci_remove_bus_device(dev); | 250 | pci_remove_bus_device(dev); |
| 251 | pci_dev_put(dev); | ||
| 249 | } | 252 | } |
| 250 | 253 | ||
| 251 | /************************************************************************** | 254 | /************************************************************************** |
