Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0984c891 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: maps: add const qualifiers 



Be a bit stricter and add few more 'const' qualifiers.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent cce2a026

drivers/mtd/maps/bfin-async-flash.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -122,7 +122,8 @@ static void bfin_flash_copy_to(struct map_info *map, unsigned long to, const voi 
	switch_back(state);

	switch_back(state);

}

}





static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };

static const char * const part_probe_types[] = {

	"cmdlinepart", "RedBoot", NULL };





static int bfin_flash_probe(struct platform_device *pdev)

static int bfin_flash_probe(struct platform_device *pdev)

{

{

drivers/mtd/maps/dc21285.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -143,9 +143,8 @@ static struct map_info dc21285_map = { 
	.copy_from = dc21285_copy_from,

	.copy_from = dc21285_copy_from,

};

};







/* Partition stuff */

/* Partition stuff */

static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };

static const char * const probes[] = { "RedBoot", "cmdlinepart", NULL };





static int __init init_dc21285(void)

static int __init init_dc21285(void)

{

{

drivers/mtd/maps/gpio-addr-flash.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,8 @@ static void gf_copy_to(struct map_info *map, unsigned long to, 
	memcpy_toio(map->virt + (to % state->win_size), from, len);

	memcpy_toio(map->virt + (to % state->win_size), from, len);

}

}





static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };

static const char * const part_probe_types[] = {

	"cmdlinepart", "RedBoot", NULL };





/**

/**

 * gpio_flash_probe() - setup a mapping for a GPIO assisted flash

 * gpio_flash_probe() - setup a mapping for a GPIO assisted flash

drivers/mtd/maps/impa7.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -24,14 +24,12 @@ 
#define NUM_FLASHBANKS 2

#define NUM_FLASHBANKS 2

#define BUSWIDTH     4

#define BUSWIDTH     4





/* can be { "cfi_probe", "jedec_probe", "map_rom", NULL } */

#define PROBETYPES { "jedec_probe", NULL }



#define MSG_PREFIX "impA7:"   /* prefix for our printk()'s */

#define MSG_PREFIX "impA7:"   /* prefix for our printk()'s */

#define MTDID      "impa7-%d"  /* for mtdparts= partitioning */

#define MTDID      "impa7-%d"  /* for mtdparts= partitioning */





static struct mtd_info *impa7_mtd[NUM_FLASHBANKS];

static struct mtd_info *impa7_mtd[NUM_FLASHBANKS];





static const char * const rom_probe_types[] = { "jedec_probe", NULL };





static struct map_info impa7_map[NUM_FLASHBANKS] = {

static struct map_info impa7_map[NUM_FLASHBANKS] = {

	{

	{
@@ -60,8 +58,7 @@ static struct mtd_partition partitions[] = 




static int __init init_impa7(void)

static int __init init_impa7(void)

{

{

	static const char *rom_probe_types[] = PROBETYPES;

	const char * const *type;

	const char **type;

	int i;

	int i;

	static struct { u_long addr; u_long size; } pt[NUM_FLASHBANKS] = {

	static struct { u_long addr; u_long size; } pt[NUM_FLASHBANKS] = {

	  { WINDOW_ADDR0, WINDOW_SIZE0 },

	  { WINDOW_ADDR0, WINDOW_SIZE0 },

drivers/mtd/maps/intel_vr_nor.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -82,9 +82,9 @@ static void vr_nor_destroy_mtd_setup(struct vr_nor_mtd *p) 




static int vr_nor_mtd_setup(struct vr_nor_mtd *p)

static int vr_nor_mtd_setup(struct vr_nor_mtd *p)

{

{

	static const char *probe_types[] =

	static const char * const probe_types[] =

	    { "cfi_probe", "jedec_probe", NULL };

	    { "cfi_probe", "jedec_probe", NULL };

	const char **type;

	const char * const *type;





	for (type = probe_types; !p->info && *type; type++)

	for (type = probe_types; !p->info && *type; type++)

		p->info = do_map_probe(*type, &p->map);

		p->info = do_map_probe(*type, &p->map);