ATA/IDE: fix platform driver hotplug/coldplug

[linux-2.6-omap-h63xx.git] / drivers / ide / legacy / ide_platform.c

diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c
index 7bb79f53dac804e708ef6a49e110804d903f993d..361b1bb544bf442ccf136aadd316839d4ae24f4e 100644 (file)
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/legacy/ide_platform.c
@@ -17,60 +17,43 @@
 #include <linux/ide.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-static struct {
-       void __iomem *plat_ide_mapbase;
-       void __iomem *plat_ide_alt_mapbase;
-       ide_hwif_t *hwif;
-       int index;
-} hwif_prop;
-
-static ide_hwif_t *__devinit plat_ide_locate_hwif(void __iomem *base,
-           void __iomem *ctrl, struct pata_platform_info *pdata, int irq,
-           int mmio)
+static void __devinit plat_ide_setup_ports(hw_regs_t *hw,
+                                          void __iomem *base,
+                                          void __iomem *ctrl,
+                                          struct pata_platform_info *pdata,
+                                          int irq)
 {
        unsigned long port = (unsigned long)base;
-       ide_hwif_t *hwif = ide_find_port(port);
        int i;
 
-       if (hwif == NULL)
-               goto out;
-
-       hwif->io_ports[IDE_DATA_OFFSET] = port;
+       hw->io_ports[IDE_DATA_OFFSET] = port;
 
        port += (1 << pdata->ioport_shift);
        for (i = IDE_ERROR_OFFSET; i <= IDE_STATUS_OFFSET;
             i++, port += (1 << pdata->ioport_shift))
-               hwif->io_ports[i] = port;
-
-       hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
+               hw->io_ports[i] = port;
 
-       hwif->irq = irq;
+       hw->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
 
-       hwif->chipset = ide_generic;
+       hw->irq = irq;
 
-       if (mmio) {
-               hwif->mmio = 1;
-               default_hwif_mmiops(hwif);
-       }
-
-       hwif_prop.hwif = hwif;
-       hwif_prop.index = hwif->index;
-out:
-       return hwif;
+       hw->chipset = ide_generic;
 }
 
 static int __devinit plat_ide_probe(struct platform_device *pdev)
 {
        struct resource *res_base, *res_alt, *res_irq;
+       void __iomem *base, *alt_base;
        ide_hwif_t *hwif;
        struct pata_platform_info *pdata;
        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        int ret = 0;
        int mmio = 0;
+       hw_regs_t hw;
 
        pdata = pdev->dev.platform_data;
 
@@ -95,30 +78,37 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
        }
 
        if (mmio) {
-               hwif_prop.plat_ide_mapbase = devm_ioremap(&pdev->dev,
+               base = devm_ioremap(&pdev->dev,
                        res_base->start, res_base->end - res_base->start + 1);
-               hwif_prop.plat_ide_alt_mapbase = devm_ioremap(&pdev->dev,
+               alt_base = devm_ioremap(&pdev->dev,
                        res_alt->start, res_alt->end - res_alt->start + 1);
        } else {
-               hwif_prop.plat_ide_mapbase = devm_ioport_map(&pdev->dev,
+               base = devm_ioport_map(&pdev->dev,
                        res_base->start, res_base->end - res_base->start + 1);
-               hwif_prop.plat_ide_alt_mapbase = devm_ioport_map(&pdev->dev,
+               alt_base = devm_ioport_map(&pdev->dev,
                        res_alt->start, res_alt->end - res_alt->start + 1);
        }
 
-       hwif = plat_ide_locate_hwif(hwif_prop.plat_ide_mapbase,
-                hwif_prop.plat_ide_alt_mapbase, pdata, res_irq->start, mmio);
-
+       hwif = ide_find_port((unsigned long)base);
        if (!hwif) {
                ret = -ENODEV;
                goto out;
        }
-       hwif->gendev.parent = &pdev->dev;
-       hwif->noprobe = 0;
+
+       memset(&hw, 0, sizeof(hw));
+       plat_ide_setup_ports(&hw, base, alt_base, pdata, res_irq->start);
+       hw.dev = &pdev->dev;
+
+       ide_init_port_hw(hwif, &hw);
+
+       if (mmio) {
+               hwif->mmio = 1;
+               default_hwif_mmiops(hwif);
+       }
 
        idx[0] = hwif->index;
 
-       ide_device_add(idx);
+       ide_device_add(idx, NULL);
 
        platform_set_drvdata(pdev, hwif);
 
@@ -132,14 +122,7 @@ static int __devexit plat_ide_remove(struct platform_device *pdev)
 {
        ide_hwif_t *hwif = pdev->dev.driver_data;
 
-       if (hwif != hwif_prop.hwif) {
-               dev_printk(KERN_DEBUG, &pdev->dev, "%s: hwif value error",
-                          pdev->name);
-       } else {
-               ide_unregister(hwif_prop.index);
-               hwif_prop.index = 0;
-               hwif_prop.hwif = NULL;
-       }
+       ide_unregister(hwif->index);
 
        return 0;
 }
@@ -147,6 +130,7 @@ static int __devexit plat_ide_remove(struct platform_device *pdev)
 static struct platform_driver platform_ide_driver = {
        .driver = {
                .name = "pata_platform",
+               .owner = THIS_MODULE,
        },
        .probe = plat_ide_probe,
        .remove = __devexit_p(plat_ide_remove),
@@ -164,6 +148,7 @@ static void __exit platform_ide_exit(void)
 
 MODULE_DESCRIPTION("Platform IDE driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pata_platform");
 
 module_init(platform_ide_init);
 module_exit(platform_ide_exit);