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

Commit 26a47346 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: add 'const' qualifier to a couple of register functions 



'mtd_device_parse_register()' and 'parse_mtd_partitions()' functions accept a
an array of character pointers. These functions modify neither the pointers nor
the characters they point to. The characters are actually names of the MTD
parsers.

At the moment, the argument type is 'const char **', which means that only the
names of the parsers are constant. Let's turn the argument type into 'const
char * const *', which means that both names and the pointers which point to
them are constant.

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

drivers/mtd/mtdcore.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ int del_mtd_device(struct mtd_info *mtd) 
 *

 * Returns zero in case of success and a negative error code in case of failure.

 */

int mtd_device_parse_register(struct mtd_info *mtd, const char **types,

int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types,

			      struct mtd_part_parser_data *parser_data,

			      const struct mtd_partition *parts,

			      int nr_parts)

drivers/mtd/mtdcore.h

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ extern int del_mtd_device(struct mtd_info *mtd); 
extern int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *,

			      int);

extern int del_mtd_partitions(struct mtd_info *);

extern int parse_mtd_partitions(struct mtd_info *master, const char **types,

extern int parse_mtd_partitions(struct mtd_info *master,

				const char * const *types,

				struct mtd_partition **pparts,

				struct mtd_part_parser_data *data);

drivers/mtd/mtdpart.c

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ static const char *default_mtd_part_types[] = { 
 * o a positive number of found partitions, in which case on exit @pparts will

 *   point to an array containing this number of &struct mtd_info objects.

 */

int parse_mtd_partitions(struct mtd_info *master, const char **types,

int parse_mtd_partitions(struct mtd_info *master, const char *const *types,

			 struct mtd_partition **pparts,

			 struct mtd_part_parser_data *data)

{

include/linux/mtd/mtd.h

+4 −4
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ struct mtd_partition; 
struct mtd_part_parser_data;



extern int mtd_device_parse_register(struct mtd_info *mtd,

			      const char **part_probe_types,

				     const char * const *part_probe_types,

				     struct mtd_part_parser_data *parser_data,

				     const struct mtd_partition *defparts,

				     int defnr_parts);