diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/ide-disk.c | 2 | ||||
| -rw-r--r-- | drivers/ide/ide-probe.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index f9c1acb4ed6a..c9d3a00a3c0c 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -1220,7 +1220,7 @@ static int ide_disk_probe(struct device *dev) | |||
| 1220 | goto failed; | 1220 | goto failed; |
| 1221 | 1221 | ||
| 1222 | g = alloc_disk_node(1 << PARTN_BITS, | 1222 | g = alloc_disk_node(1 << PARTN_BITS, |
| 1223 | pcibus_to_node(drive->hwif->pci_dev->bus)); | 1223 | hwif_to_node(drive->hwif)); |
| 1224 | if (!g) | 1224 | if (!g) |
| 1225 | goto out_free_idkp; | 1225 | goto out_free_idkp; |
| 1226 | 1226 | ||
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 94daf40ae323..c1128ae5cd2f 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -960,15 +960,6 @@ static void save_match(ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match) | |||
| 960 | } | 960 | } |
| 961 | #endif /* MAX_HWIFS > 1 */ | 961 | #endif /* MAX_HWIFS > 1 */ |
| 962 | 962 | ||
| 963 | static inline int hwif_to_node(ide_hwif_t *hwif) | ||
| 964 | { | ||
| 965 | if (hwif->pci_dev) | ||
| 966 | return pcibus_to_node(hwif->pci_dev->bus); | ||
| 967 | else | ||
| 968 | /* Add ways to determine the node of other busses here */ | ||
| 969 | return -1; | ||
| 970 | } | ||
| 971 | |||
| 972 | /* | 963 | /* |
| 973 | * init request queue | 964 | * init request queue |
| 974 | */ | 965 | */ |
