From d6e0d8d83d83892636393455ff99cdfe49b44474 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Tue, 12 Mar 2013 10:32:52 +0200 Subject: [PATCH] --- yaml --- r: 374743 b: refs/heads/master c: f39cf6c7d472349a9907955ef213db1f26618ba0 h: refs/heads/master i: 374741: 17b0d7c4c47247760f5686e2f56dd697caf4d936 374739: 2cf889c03681f195699fbc2601a59b33ae696c12 374735: e44bfe3044d99f1227fbbb48f90893a867498b2f v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/physmap.c | 17 +++++++---------- trunk/include/linux/mtd/physmap.h | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 379a082b3cb4..b9ea3addb027 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d50dcb1d0e1f8ebe11db1719aad5753cd1b4c4f8 +refs/heads/master: f39cf6c7d472349a9907955ef213db1f26618ba0 diff --git a/trunk/drivers/mtd/maps/physmap.c b/trunk/drivers/mtd/maps/physmap.c index 21b0b713cacb..e7a592c8c765 100644 --- a/trunk/drivers/mtd/maps/physmap.c +++ b/trunk/drivers/mtd/maps/physmap.c @@ -87,21 +87,18 @@ static void physmap_set_vpp(struct map_info *map, int state) spin_unlock_irqrestore(&info->vpp_lock, flags); } -static const char *rom_probe_types[] = { - "cfi_probe", - "jedec_probe", - "qinfo_probe", - "map_rom", - NULL }; -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs", - NULL }; +static const char * const rom_probe_types[] = { + "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL }; + +static const char * const part_probe_types[] = { + "cmdlinepart", "RedBoot", "afs", NULL }; static int physmap_flash_probe(struct platform_device *dev) { struct physmap_flash_data *physmap_data; struct physmap_flash_info *info; - const char **probe_type; - const char **part_types; + const char * const *probe_type; + const char * const *part_types; int err = 0; int i; int devices_found = 0; diff --git a/trunk/include/linux/mtd/physmap.h b/trunk/include/linux/mtd/physmap.h index d2887e76b7f6..aa6a2633c2da 100644 --- a/trunk/include/linux/mtd/physmap.h +++ b/trunk/include/linux/mtd/physmap.h @@ -30,7 +30,7 @@ struct physmap_flash_data { unsigned int pfow_base; char *probe_type; struct mtd_partition *parts; - const char **part_probe_types; + const char * const *part_probe_types; }; #endif /* __LINUX_MTD_PHYSMAP__ */