diff options
Diffstat (limited to 'drivers/ide/ide_platform.c')
-rw-r--r-- | drivers/ide/ide_platform.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c index 051b4ab0f359..ee9b55ecc62b 100644 --- a/drivers/ide/ide_platform.c +++ b/drivers/ide/ide_platform.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | 23 | ||
24 | static void __devinit plat_ide_setup_ports(hw_regs_t *hw, | 24 | static void __devinit plat_ide_setup_ports(struct ide_hw *hw, |
25 | void __iomem *base, | 25 | void __iomem *base, |
26 | void __iomem *ctrl, | 26 | void __iomem *ctrl, |
27 | struct pata_platform_info *pdata, | 27 | struct pata_platform_info *pdata, |
@@ -40,12 +40,11 @@ static void __devinit plat_ide_setup_ports(hw_regs_t *hw, | |||
40 | hw->io_ports.ctl_addr = (unsigned long)ctrl; | 40 | hw->io_ports.ctl_addr = (unsigned long)ctrl; |
41 | 41 | ||
42 | hw->irq = irq; | 42 | hw->irq = irq; |
43 | |||
44 | hw->chipset = ide_generic; | ||
45 | } | 43 | } |
46 | 44 | ||
47 | static const struct ide_port_info platform_ide_port_info = { | 45 | static const struct ide_port_info platform_ide_port_info = { |
48 | .host_flags = IDE_HFLAG_NO_DMA, | 46 | .host_flags = IDE_HFLAG_NO_DMA, |
47 | .chipset = ide_generic, | ||
49 | }; | 48 | }; |
50 | 49 | ||
51 | static int __devinit plat_ide_probe(struct platform_device *pdev) | 50 | static int __devinit plat_ide_probe(struct platform_device *pdev) |
@@ -55,7 +54,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) | |||
55 | struct pata_platform_info *pdata; | 54 | struct pata_platform_info *pdata; |
56 | struct ide_host *host; | 55 | struct ide_host *host; |
57 | int ret = 0, mmio = 0; | 56 | int ret = 0, mmio = 0; |
58 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 57 | struct ide_hw hw, *hws[] = { &hw }; |
59 | struct ide_port_info d = platform_ide_port_info; | 58 | struct ide_port_info d = platform_ide_port_info; |
60 | 59 | ||
61 | pdata = pdev->dev.platform_data; | 60 | pdata = pdev->dev.platform_data; |
@@ -99,7 +98,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) | |||
99 | if (mmio) | 98 | if (mmio) |
100 | d.host_flags |= IDE_HFLAG_MMIO; | 99 | d.host_flags |= IDE_HFLAG_MMIO; |
101 | 100 | ||
102 | ret = ide_host_add(&d, hws, &host); | 101 | ret = ide_host_add(&d, hws, 1, &host); |
103 | if (ret) | 102 | if (ret) |
104 | goto out; | 103 | goto out; |
105 | 104 | ||