diff options
Diffstat (limited to 'drivers/ide/ide_platform.c')
-rw-r--r-- | drivers/ide/ide_platform.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c index 962693b10a1c..ba4bfbead24b 100644 --- a/drivers/ide/ide_platform.c +++ b/drivers/ide/ide_platform.c | |||
@@ -22,11 +22,9 @@ | |||
22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
24 | 24 | ||
25 | static void __devinit plat_ide_setup_ports(struct ide_hw *hw, | 25 | static void plat_ide_setup_ports(struct ide_hw *hw, void __iomem *base, |
26 | void __iomem *base, | 26 | void __iomem *ctrl, |
27 | void __iomem *ctrl, | 27 | struct pata_platform_info *pdata, int irq) |
28 | struct pata_platform_info *pdata, | ||
29 | int irq) | ||
30 | { | 28 | { |
31 | unsigned long port = (unsigned long)base; | 29 | unsigned long port = (unsigned long)base; |
32 | int i; | 30 | int i; |
@@ -48,7 +46,7 @@ static const struct ide_port_info platform_ide_port_info = { | |||
48 | .chipset = ide_generic, | 46 | .chipset = ide_generic, |
49 | }; | 47 | }; |
50 | 48 | ||
51 | static int __devinit plat_ide_probe(struct platform_device *pdev) | 49 | static int plat_ide_probe(struct platform_device *pdev) |
52 | { | 50 | { |
53 | struct resource *res_base, *res_alt, *res_irq; | 51 | struct resource *res_base, *res_alt, *res_irq; |
54 | void __iomem *base, *alt_base; | 52 | void __iomem *base, *alt_base; |
@@ -115,7 +113,7 @@ out: | |||
115 | return ret; | 113 | return ret; |
116 | } | 114 | } |
117 | 115 | ||
118 | static int __devexit plat_ide_remove(struct platform_device *pdev) | 116 | static int plat_ide_remove(struct platform_device *pdev) |
119 | { | 117 | { |
120 | struct ide_host *host = dev_get_drvdata(&pdev->dev); | 118 | struct ide_host *host = dev_get_drvdata(&pdev->dev); |
121 | 119 | ||
@@ -130,7 +128,7 @@ static struct platform_driver platform_ide_driver = { | |||
130 | .owner = THIS_MODULE, | 128 | .owner = THIS_MODULE, |
131 | }, | 129 | }, |
132 | .probe = plat_ide_probe, | 130 | .probe = plat_ide_probe, |
133 | .remove = __devexit_p(plat_ide_remove), | 131 | .remove = plat_ide_remove, |
134 | }; | 132 | }; |
135 | 133 | ||
136 | static int __init platform_ide_init(void) | 134 | static int __init platform_ide_init(void) |