|
@@ -71,6 +71,9 @@ static int of_flash_remove(struct platform_device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static const char * const rom_probe_types[] = {
|
|
|
+ "cfi_probe", "jedec_probe", "map_rom" };
|
|
|
+
|
|
|
/* Helper function to handle probing of the obsolete "direct-mapped"
|
|
|
* compatible binding, which has an extra "probe-type" property
|
|
|
* describing the type of flash probe necessary. */
|
|
@@ -80,8 +83,6 @@ static struct mtd_info *obsolete_probe(struct platform_device *dev,
|
|
|
struct device_node *dp = dev->dev.of_node;
|
|
|
const char *of_probe;
|
|
|
struct mtd_info *mtd;
|
|
|
- static const char *rom_probe_types[]
|
|
|
- = { "cfi_probe", "jedec_probe", "map_rom"};
|
|
|
int i;
|
|
|
|
|
|
dev_warn(&dev->dev, "Device tree uses obsolete \"direct-mapped\" "
|
|
@@ -111,9 +112,10 @@ static struct mtd_info *obsolete_probe(struct platform_device *dev,
|
|
|
specifies the list of partition probers to use. If none is given then the
|
|
|
default is use. These take precedence over other device tree
|
|
|
information. */
|
|
|
-static const char *part_probe_types_def[] = { "cmdlinepart", "RedBoot",
|
|
|
- "ofpart", "ofoldpart", NULL };
|
|
|
-static const char **of_get_probes(struct device_node *dp)
|
|
|
+static const char * const part_probe_types_def[] = {
|
|
|
+ "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL };
|
|
|
+
|
|
|
+static const char * const *of_get_probes(struct device_node *dp)
|
|
|
{
|
|
|
const char *cp;
|
|
|
int cplen;
|
|
@@ -142,7 +144,7 @@ static const char **of_get_probes(struct device_node *dp)
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
-static void of_free_probes(const char **probes)
|
|
|
+static void of_free_probes(const char * const *probes)
|
|
|
{
|
|
|
if (probes != part_probe_types_def)
|
|
|
kfree(probes);
|
|
@@ -151,7 +153,7 @@ static void of_free_probes(const char **probes)
|
|
|
static struct of_device_id of_flash_match[];
|
|
|
static int of_flash_probe(struct platform_device *dev)
|
|
|
{
|
|
|
- const char **part_probe_types;
|
|
|
+ const char * const *part_probe_types;
|
|
|
const struct of_device_id *match;
|
|
|
struct device_node *dp = dev->dev.of_node;
|
|
|
struct resource res;
|