Commit 3dfad123 authored by Jamie Iles's avatar Jamie Iles Committed by David Woodhouse

mtd: pxa: convert to mtd_device_register()

Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Cc: Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 6cbbf2ff
...@@ -153,7 +153,6 @@ config MACH_XCEP ...@@ -153,7 +153,6 @@ config MACH_XCEP
bool "Iskratel Electronics XCEP" bool "Iskratel Electronics XCEP"
select PXA25x select PXA25x
select MTD select MTD
select MTD_PARTITIONS
select MTD_PHYSMAP select MTD_PHYSMAP
select MTD_CFI_INTELEXT select MTD_CFI_INTELEXT
select MTD_CFI select MTD_CFI
......
...@@ -161,7 +161,6 @@ config MTD_SBC_GXX ...@@ -161,7 +161,6 @@ config MTD_SBC_GXX
config MTD_PXA2XX config MTD_PXA2XX
tristate "CFI Flash device mapped on Intel XScale PXA2xx based boards" tristate "CFI Flash device mapped on Intel XScale PXA2xx based boards"
depends on (PXA25x || PXA27x) && MTD_CFI_INTELEXT depends on (PXA25x || PXA27x) && MTD_CFI_INTELEXT
select MTD_PARTITIONS
help help
This provides a driver for the NOR flash attached to a PXA2xx chip. This provides a driver for the NOR flash attached to a PXA2xx chip.
......
...@@ -104,23 +104,18 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev) ...@@ -104,23 +104,18 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
} }
info->mtd->owner = THIS_MODULE; info->mtd->owner = THIS_MODULE;
#ifdef CONFIG_MTD_PARTITIONS
ret = parse_mtd_partitions(info->mtd, probes, &parts, 0); ret = parse_mtd_partitions(info->mtd, probes, &parts, 0);
if (ret > 0) { if (ret > 0) {
info->nr_parts = ret; info->nr_parts = ret;
info->parts = parts; info->parts = parts;
} }
#endif
if (info->nr_parts) { if (!info->nr_parts)
add_mtd_partitions(info->mtd, info->parts,
info->nr_parts);
} else {
printk("Registering %s as whole device\n", printk("Registering %s as whole device\n",
info->map.name); info->map.name);
add_mtd_device(info->mtd);
} mtd_device_register(info->mtd, info->parts, info->nr_parts);
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
return 0; return 0;
...@@ -132,12 +127,7 @@ static int __devexit pxa2xx_flash_remove(struct platform_device *dev) ...@@ -132,12 +127,7 @@ static int __devexit pxa2xx_flash_remove(struct platform_device *dev)
platform_set_drvdata(dev, NULL); platform_set_drvdata(dev, NULL);
#ifdef CONFIG_MTD_PARTITIONS mtd_device_unregister(info->mtd);
if (info->nr_parts)
del_mtd_partitions(info->mtd);
else
#endif
del_mtd_device(info->mtd);
map_destroy(info->mtd); map_destroy(info->mtd);
iounmap(info->map.virt); iounmap(info->map.virt);
......
...@@ -1119,10 +1119,7 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) ...@@ -1119,10 +1119,7 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
clk_put(info->clk); clk_put(info->clk);
if (mtd) { if (mtd) {
del_mtd_device(mtd); mtd_device_unregister(mtd);
#ifdef CONFIG_MTD_PARTITIONS
del_mtd_partitions(mtd);
#endif
kfree(mtd); kfree(mtd);
} }
return 0; return 0;
...@@ -1149,7 +1146,6 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) ...@@ -1149,7 +1146,6 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
#ifdef CONFIG_MTD_PARTITIONS
if (mtd_has_cmdlinepart()) { if (mtd_has_cmdlinepart()) {
const char *probes[] = { "cmdlinepart", NULL }; const char *probes[] = { "cmdlinepart", NULL };
struct mtd_partition *parts; struct mtd_partition *parts;
...@@ -1158,13 +1154,10 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) ...@@ -1158,13 +1154,10 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
nr_parts = parse_mtd_partitions(info->mtd, probes, &parts, 0); nr_parts = parse_mtd_partitions(info->mtd, probes, &parts, 0);
if (nr_parts) if (nr_parts)
return add_mtd_partitions(info->mtd, parts, nr_parts); return mtd_device_register(info->mtd, parts, nr_parts);
} }
return add_mtd_partitions(info->mtd, pdata->parts, pdata->nr_parts); return mtd_device_register(info->mtd, pdata->parts, pdata->nr_parts);
#else
return 0;
#endif
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
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