diff options
-rw-r--r-- | drivers/mtd/mtdpart.c | 2 | ||||
-rw-r--r-- | drivers/mtd/ofpart.c | 4 | ||||
-rw-r--r-- | include/linux/mtd/partitions.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 6e732c3820c1..67a89bb45943 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c | |||
@@ -534,7 +534,7 @@ out_register: | |||
534 | return slave; | 534 | return slave; |
535 | } | 535 | } |
536 | 536 | ||
537 | int mtd_add_partition(struct mtd_info *master, char *name, | 537 | int mtd_add_partition(struct mtd_info *master, const char *name, |
538 | long long offset, long long length) | 538 | long long offset, long long length) |
539 | { | 539 | { |
540 | struct mtd_partition part; | 540 | struct mtd_partition part; |
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c index d64f8c30945f..f0a708bf9b0e 100644 --- a/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c | |||
@@ -81,7 +81,7 @@ static int parse_ofpart_partitions(struct mtd_info *master, | |||
81 | partname = of_get_property(pp, "label", &len); | 81 | partname = of_get_property(pp, "label", &len); |
82 | if (!partname) | 82 | if (!partname) |
83 | partname = of_get_property(pp, "name", &len); | 83 | partname = of_get_property(pp, "name", &len); |
84 | (*pparts)[i].name = (char *)partname; | 84 | (*pparts)[i].name = partname; |
85 | 85 | ||
86 | if (of_get_property(pp, "read-only", &len)) | 86 | if (of_get_property(pp, "read-only", &len)) |
87 | (*pparts)[i].mask_flags |= MTD_WRITEABLE; | 87 | (*pparts)[i].mask_flags |= MTD_WRITEABLE; |
@@ -152,7 +152,7 @@ static int parse_ofoldpart_partitions(struct mtd_info *master, | |||
152 | if (names && (plen > 0)) { | 152 | if (names && (plen > 0)) { |
153 | int len = strlen(names) + 1; | 153 | int len = strlen(names) + 1; |
154 | 154 | ||
155 | (*pparts)[i].name = (char *)names; | 155 | (*pparts)[i].name = names; |
156 | plen -= len; | 156 | plen -= len; |
157 | names += len; | 157 | names += len; |
158 | } else { | 158 | } else { |
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h index 1f8d24bdafda..335ffca10c10 100644 --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h | |||
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | struct mtd_partition { | 39 | struct mtd_partition { |
40 | char *name; /* identifier string */ | 40 | const char *name; /* identifier string */ |
41 | uint64_t size; /* partition size */ | 41 | uint64_t size; /* partition size */ |
42 | uint64_t offset; /* offset within the master MTD space */ | 42 | uint64_t offset; /* offset within the master MTD space */ |
43 | uint32_t mask_flags; /* master MTD flags to mask out for this partition */ | 43 | uint32_t mask_flags; /* master MTD flags to mask out for this partition */ |
@@ -80,7 +80,7 @@ extern int register_mtd_parser(struct mtd_part_parser *parser); | |||
80 | extern int deregister_mtd_parser(struct mtd_part_parser *parser); | 80 | extern int deregister_mtd_parser(struct mtd_part_parser *parser); |
81 | 81 | ||
82 | int mtd_is_partition(const struct mtd_info *mtd); | 82 | int mtd_is_partition(const struct mtd_info *mtd); |
83 | int mtd_add_partition(struct mtd_info *master, char *name, | 83 | int mtd_add_partition(struct mtd_info *master, const char *name, |
84 | long long offset, long long length); | 84 | long long offset, long long length); |
85 | int mtd_del_partition(struct mtd_info *master, int partno); | 85 | int mtd_del_partition(struct mtd_info *master, int partno); |
86 | uint64_t mtd_get_device_size(const struct mtd_info *mtd); | 86 | uint64_t mtd_get_device_size(const struct mtd_info *mtd); |