ide_platform: remove struct hwif_prop

* Remove 'if (hwif != hwif_prop.hwif)' check from plat_ide_remove()
  (pdev->dev.driver_data and hwif_prop.hwif are set at the same time
   in plat_ide_probe() and are identical).

* Use hwif->index for ide_unregister() in plat_ide_remove().

* Use local variables instead of hwif_prop.plat_ide[_alt]_mapbase in
  plat_ide_probe() and remove no longer needed struct hwif_prop.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 48535651
...@@ -21,13 +21,6 @@ ...@@ -21,13 +21,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.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 void __devinit plat_ide_setup_ports(hw_regs_t *hw, static void __devinit plat_ide_setup_ports(hw_regs_t *hw,
void __iomem *base, void __iomem *base,
void __iomem *ctrl, void __iomem *ctrl,
...@@ -54,6 +47,7 @@ static void __devinit plat_ide_setup_ports(hw_regs_t *hw, ...@@ -54,6 +47,7 @@ static void __devinit plat_ide_setup_ports(hw_regs_t *hw,
static int __devinit plat_ide_probe(struct platform_device *pdev) static int __devinit plat_ide_probe(struct platform_device *pdev)
{ {
struct resource *res_base, *res_alt, *res_irq; struct resource *res_base, *res_alt, *res_irq;
void __iomem *base, *alt_base;
ide_hwif_t *hwif; ide_hwif_t *hwif;
struct pata_platform_info *pdata; struct pata_platform_info *pdata;
u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
...@@ -84,27 +78,25 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) ...@@ -84,27 +78,25 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
} }
if (mmio) { 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); 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); res_alt->start, res_alt->end - res_alt->start + 1);
} else { } 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); 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); res_alt->start, res_alt->end - res_alt->start + 1);
} }
hwif = ide_find_port((unsigned long)hwif_prop.plat_ide_mapbase); hwif = ide_find_port((unsigned long)base);
if (!hwif) { if (!hwif) {
ret = -ENODEV; ret = -ENODEV;
goto out; goto out;
} }
memset(&hw, 0, sizeof(hw)); memset(&hw, 0, sizeof(hw));
plat_ide_setup_ports(&hw, hwif_prop.plat_ide_mapbase, plat_ide_setup_ports(&hw, base, alt_base, pdata, res_irq->start);
hwif_prop.plat_ide_alt_mapbase,
pdata, res_irq->start);
hw.dev = &pdev->dev; hw.dev = &pdev->dev;
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
...@@ -114,9 +106,6 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) ...@@ -114,9 +106,6 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
default_hwif_mmiops(hwif); default_hwif_mmiops(hwif);
} }
hwif_prop.hwif = hwif;
hwif_prop.index = hwif->index;
idx[0] = hwif->index; idx[0] = hwif->index;
ide_device_add(idx); ide_device_add(idx);
...@@ -133,14 +122,7 @@ static int __devexit plat_ide_remove(struct platform_device *pdev) ...@@ -133,14 +122,7 @@ static int __devexit plat_ide_remove(struct platform_device *pdev)
{ {
ide_hwif_t *hwif = pdev->dev.driver_data; ide_hwif_t *hwif = pdev->dev.driver_data;
if (hwif != hwif_prop.hwif) { ide_unregister(hwif->index);
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;
}
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment