Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemo...

[linux-2.6] / drivers / mtd / maps / plat-ram.c

diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index 894c0b27128982fc5d52a6fc79a7b32efecc320f..e7dd9c8a965e2fc86d32b98eaa060657d0819724 100644 (file)
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -6,8 +6,6 @@
  *
  * Generic platfrom device based RAM map
  *
- * $Id: plat-ram.c,v 1.7 2005/11/07 11:14:28 gleixner Exp $
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -47,6 +45,7 @@ struct platram_info {
        struct mtd_info         *mtd;
        struct map_info          map;
        struct mtd_partition    *partitions;
+       bool                    free_partitions;
        struct resource         *area;
        struct platdata_mtd_ram *pdata;
 };
@@ -98,7 +97,8 @@ static int platram_remove(struct platform_device *pdev)
 #ifdef CONFIG_MTD_PARTITIONS
                if (info->partitions) {
                        del_mtd_partitions(info->mtd);
-                       kfree(info->partitions);
+                       if (info->free_partitions)
+                               kfree(info->partitions);
                }
 #endif
                del_mtd_device(info->mtd);
@@ -176,7 +176,8 @@ static int platram_probe(struct platform_device *pdev)
 
        info->map.phys = res->start;
        info->map.size = (res->end - res->start) + 1;
-       info->map.name = pdata->mapname != NULL ? pdata->mapname : (char *)pdev->name;
+       info->map.name = pdata->mapname != NULL ?
+                       (char *)pdata->mapname : (char *)pdev->name;
        info->map.bankwidth = pdata->bankwidth;
 
        /* register our usage of the memory area */
@@ -203,9 +204,19 @@ static int platram_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "initialised map, probing for mtd\n");
 
-       /* probe for the right mtd map driver */
+       /* probe for the right mtd map driver
+        * supplied by the platform_data struct */
+
+       if (pdata->map_probes) {
+               const char **map_probes = pdata->map_probes;
+
+               for ( ; !info->mtd && *map_probes; map_probes++)
+                       info->mtd = do_map_probe(*map_probes , &info->map);
+       }
+       /* fallback to map_ram */
+       else
+               info->mtd = do_map_probe("map_ram", &info->map);
 
-       info->mtd = do_map_probe("map_ram" , &info->map);
        if (info->mtd == NULL) {
                dev_err(&pdev->dev, "failed to probe for map_ram\n");
                err = -ENOMEM;
@@ -220,19 +231,21 @@ static int platram_probe(struct platform_device *pdev)
         * to add this device whole */
 
 #ifdef CONFIG_MTD_PARTITIONS
-       if (pdata->nr_partitions > 0) {
-               const char **probes = { NULL };
-
-               if (pdata->probes)
-                       probes = (const char **)pdata->probes;
-
-               err = parse_mtd_partitions(info->mtd, probes,
+       if (!pdata->nr_partitions) {
+               /* try to probe using the supplied probe type */
+               if (pdata->probes) {
+                       err = parse_mtd_partitions(info->mtd, pdata->probes,
                                           &info->partitions, 0);
-               if (err > 0) {
-                       err = add_mtd_partitions(info->mtd, info->partitions,
-                                                err);
+                       info->free_partitions = 1;
+                       if (err > 0)
+                               err = add_mtd_partitions(info->mtd,
+                                       info->partitions, err);
                }
        }
+       /* use the static mapping */
+       else
+               err = add_mtd_partitions(info->mtd, pdata->partitions,
+                               pdata->nr_partitions);
 #endif /* CONFIG_MTD_PARTITIONS */
 
        if (add_mtd_device(info->mtd)) {
@@ -240,7 +253,9 @@ static int platram_probe(struct platform_device *pdev)
                err = -ENOMEM;
        }
 
-       dev_info(&pdev->dev, "registered mtd device\n");
+       if (!err)
+               dev_info(&pdev->dev, "registered mtd device\n");
+
        return err;
 
  exit_free:
@@ -251,6 +266,9 @@ static int platram_probe(struct platform_device *pdev)
 
 /* device driver info */
 
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:mtd-ram");
+
 static struct platform_driver platram_driver = {
        .probe          = platram_probe,
        .remove         = platram_remove,