diff mbox

[60/62] mtd/lantiq: convert to mtd_device_register()

Message ID 1306142623-24952-61-git-send-email-jamie@jamieiles.com
State Accepted
Headers show

Commit Message

Jamie Iles May 23, 2011, 9:23 a.m. UTC 
Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Cc: John Crispin <blogic@openwrt.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 drivers/mtd/maps/lantiq-flash.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

John Crispin May 27, 2011, 9:27 a.m. UTC | #1 
On 23/05/11 11:23, Jamie Iles wrote:
> Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
> preprocessor conditionals as partitioning is always available.
>
> Cc: John Crispin <blogic@openwrt.org>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Artem Bityutskiy <dedekind1@gmail.com>
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
> ---
>  drivers/mtd/maps/lantiq-flash.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
>   

Acked-by: John Crispin <blogic@openwrt.org>
diff mbox

Patch

diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index a90cabd..8faeb492 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -182,7 +182,7 @@  ltq_mtd_probe(struct platform_device *pdev)
 		parts = ltq_mtd_data->parts;
 	}
 
-	err = add_mtd_partitions(ltq_mtd->mtd, parts, nr_parts);
+	err = mtd_register_device(ltq_mtd->mtd, parts, nr_parts);
 	if (err) {
 		dev_err(&pdev->dev, "failed to add partitions\n");
 		goto err_destroy;
@@ -208,7 +208,7 @@  ltq_mtd_remove(struct platform_device *pdev)
 
 	if (ltq_mtd) {
 		if (ltq_mtd->mtd) {
-			del_mtd_partitions(ltq_mtd->mtd);
+			mtd_device_unregister(ltq_mtd->mtd);
 			map_destroy(ltq_mtd->mtd);
 		}
 		if (ltq_mtd->map->virt)