diff options
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 6c7451a6e609..29363829a3fe 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1173,7 +1173,7 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index) | |||
1173 | ide_port_init_devices_data(hwif); | 1173 | ide_port_init_devices_data(hwif); |
1174 | } | 1174 | } |
1175 | 1175 | ||
1176 | static void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw) | 1176 | static void ide_init_port_hw(ide_hwif_t *hwif, struct ide_hw *hw) |
1177 | { | 1177 | { |
1178 | memcpy(&hwif->io_ports, &hw->io_ports, sizeof(hwif->io_ports)); | 1178 | memcpy(&hwif->io_ports, &hw->io_ports, sizeof(hwif->io_ports)); |
1179 | hwif->irq = hw->irq; | 1179 | hwif->irq = hw->irq; |
@@ -1261,8 +1261,8 @@ out_nomem: | |||
1261 | return -ENOMEM; | 1261 | return -ENOMEM; |
1262 | } | 1262 | } |
1263 | 1263 | ||
1264 | struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws, | 1264 | struct ide_host *ide_host_alloc(const struct ide_port_info *d, |
1265 | unsigned int n_ports) | 1265 | struct ide_hw **hws, unsigned int n_ports) |
1266 | { | 1266 | { |
1267 | struct ide_host *host; | 1267 | struct ide_host *host; |
1268 | struct device *dev = hws[0] ? hws[0]->dev : NULL; | 1268 | struct device *dev = hws[0] ? hws[0]->dev : NULL; |
@@ -1349,7 +1349,7 @@ static void ide_disable_port(ide_hwif_t *hwif) | |||
1349 | } | 1349 | } |
1350 | 1350 | ||
1351 | int ide_host_register(struct ide_host *host, const struct ide_port_info *d, | 1351 | int ide_host_register(struct ide_host *host, const struct ide_port_info *d, |
1352 | hw_regs_t **hws) | 1352 | struct ide_hw **hws) |
1353 | { | 1353 | { |
1354 | ide_hwif_t *hwif, *mate = NULL; | 1354 | ide_hwif_t *hwif, *mate = NULL; |
1355 | int i, j = 0; | 1355 | int i, j = 0; |
@@ -1443,7 +1443,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, | |||
1443 | } | 1443 | } |
1444 | EXPORT_SYMBOL_GPL(ide_host_register); | 1444 | EXPORT_SYMBOL_GPL(ide_host_register); |
1445 | 1445 | ||
1446 | int ide_host_add(const struct ide_port_info *d, hw_regs_t **hws, | 1446 | int ide_host_add(const struct ide_port_info *d, struct ide_hw **hws, |
1447 | unsigned int n_ports, struct ide_host **hostp) | 1447 | unsigned int n_ports, struct ide_host **hostp) |
1448 | { | 1448 | { |
1449 | struct ide_host *host; | 1449 | struct ide_host *host; |