diff options
Diffstat (limited to 'drivers/ide/ide-legacy.c')
-rw-r--r-- | drivers/ide/ide-legacy.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/ide-legacy.c b/drivers/ide/ide-legacy.c index 8c5dcbf22547..b9654a7bb7be 100644 --- a/drivers/ide/ide-legacy.c +++ b/drivers/ide/ide-legacy.c | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
2 | #include <linux/ide.h> | 2 | #include <linux/ide.h> |
3 | 3 | ||
4 | static void ide_legacy_init_one(hw_regs_t **hws, hw_regs_t *hw, | 4 | static void ide_legacy_init_one(struct ide_hw **hws, struct ide_hw *hw, |
5 | u8 port_no, const struct ide_port_info *d, | 5 | u8 port_no, const struct ide_port_info *d, |
6 | unsigned long config) | 6 | unsigned long config) |
7 | { | 7 | { |
@@ -33,7 +33,6 @@ static void ide_legacy_init_one(hw_regs_t **hws, hw_regs_t *hw, | |||
33 | 33 | ||
34 | ide_std_init_ports(hw, base, ctl); | 34 | ide_std_init_ports(hw, base, ctl); |
35 | hw->irq = irq; | 35 | hw->irq = irq; |
36 | hw->chipset = d->chipset; | ||
37 | hw->config = config; | 36 | hw->config = config; |
38 | 37 | ||
39 | hws[port_no] = hw; | 38 | hws[port_no] = hw; |
@@ -41,7 +40,7 @@ static void ide_legacy_init_one(hw_regs_t **hws, hw_regs_t *hw, | |||
41 | 40 | ||
42 | int ide_legacy_device_add(const struct ide_port_info *d, unsigned long config) | 41 | int ide_legacy_device_add(const struct ide_port_info *d, unsigned long config) |
43 | { | 42 | { |
44 | hw_regs_t hw[2], *hws[] = { NULL, NULL, NULL, NULL }; | 43 | struct ide_hw hw[2], *hws[] = { NULL, NULL }; |
45 | 44 | ||
46 | memset(&hw, 0, sizeof(hw)); | 45 | memset(&hw, 0, sizeof(hw)); |
47 | 46 | ||
@@ -53,6 +52,6 @@ int ide_legacy_device_add(const struct ide_port_info *d, unsigned long config) | |||
53 | (d->host_flags & IDE_HFLAG_SINGLE)) | 52 | (d->host_flags & IDE_HFLAG_SINGLE)) |
54 | return -ENOENT; | 53 | return -ENOENT; |
55 | 54 | ||
56 | return ide_host_add(d, hws, NULL); | 55 | return ide_host_add(d, hws, 2, NULL); |
57 | } | 56 | } |
58 | EXPORT_SYMBOL_GPL(ide_legacy_device_add); | 57 | EXPORT_SYMBOL_GPL(ide_legacy_device_add); |