mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
c13b4ef2c8
When mtdsplit_minor.c is compiled under Linux 4.4, the compiler
drops the following warning:
CC drivers/mtd/mtdsplit/mtdsplit_minor.o
drivers/mtd/mtdsplit/mtdsplit_minor.c:106:14: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types]
.parse_fn = mtdsplit_parse_minor,
^
drivers/mtd/mtdsplit/mtdsplit_minor.c:106:14: note: (near initialization for 'mtdsplit_minor_parser.parse_fn')
The second parameter of the parser function must not have a 'const'
qualifier in 4.4. The 001-mtdsplit_backport.patch removes the qualifier
from other partition parsers. Update it to handle mtdsplit_minor.c as
well.
Signed-off-by: Gabor Juhos <juhosg@freemail.hu>
154 lines
5.0 KiB
Diff
154 lines
5.0 KiB
Diff
--- a/drivers/mtd/mtdsplit/mtdsplit_brnimage.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_brnimage.c
|
|
@@ -27,7 +27,7 @@
|
|
#define BRNIMAGE_MAX_OVERHEAD (BRNIMAGE_ALIGN_BYTES + BRNIMAGE_FOOTER_SIZE)
|
|
|
|
static int mtdsplit_parse_brnimage(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct mtd_partition *parts;
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_eva.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_eva.c
|
|
@@ -29,7 +29,7 @@ struct eva_image_header {
|
|
};
|
|
|
|
static int mtdsplit_parse_eva(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct mtd_partition *parts;
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_fit.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_fit.c
|
|
@@ -45,8 +45,7 @@ struct fdt_header {
|
|
};
|
|
|
|
static int
|
|
-mtdsplit_fit_parse(struct mtd_info *mtd,
|
|
- const struct mtd_partition **pparts,
|
|
+mtdsplit_fit_parse(struct mtd_info *mtd, struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct fdt_header hdr;
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_lzma.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_lzma.c
|
|
@@ -28,7 +28,7 @@ struct lzma_header {
|
|
};
|
|
|
|
static int mtdsplit_parse_lzma(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct lzma_header hdr;
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_seama.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_seama.c
|
|
@@ -30,7 +30,7 @@ struct seama_header {
|
|
};
|
|
|
|
static int mtdsplit_parse_seama(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct seama_header hdr;
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_squashfs.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_squashfs.c
|
|
@@ -23,7 +23,7 @@
|
|
|
|
static int
|
|
mtdsplit_parse_squashfs(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct mtd_partition *part;
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_tplink.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_tplink.c
|
|
@@ -83,8 +83,8 @@ struct tplink_fw_header {
|
|
};
|
|
|
|
static int mtdsplit_parse_tplink(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
- struct mtd_part_parser_data *data)
|
|
+ struct mtd_partition **pparts,
|
|
+ struct mtd_part_parser_data *data)
|
|
{
|
|
struct tplink_fw_header hdr;
|
|
size_t hdr_len, retlen, kernel_size;
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_trx.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_trx.c
|
|
@@ -56,7 +56,7 @@ read_trx_header(struct mtd_info *mtd, si
|
|
|
|
static int
|
|
mtdsplit_parse_trx(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct mtd_partition *parts;
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_uimage.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_uimage.c
|
|
@@ -81,7 +81,7 @@ read_uimage_header(struct mtd_info *mtd,
|
|
* of a valid uImage header if found
|
|
*/
|
|
static int __mtdsplit_parse_uimage(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data,
|
|
ssize_t (*find_header)(u_char *buf, size_t len))
|
|
{
|
|
@@ -232,7 +232,7 @@ static ssize_t uimage_verify_default(u_c
|
|
|
|
static int
|
|
mtdsplit_uimage_parse_generic(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
return __mtdsplit_parse_uimage(master, pparts, data,
|
|
@@ -289,7 +289,7 @@ static ssize_t uimage_verify_wndr3700(u_
|
|
|
|
static int
|
|
mtdsplit_uimage_parse_netgear(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
return __mtdsplit_parse_uimage(master, pparts, data,
|
|
@@ -331,7 +331,7 @@ static ssize_t uimage_find_edimax(u_char
|
|
|
|
static int
|
|
mtdsplit_uimage_parse_edimax(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
return __mtdsplit_parse_uimage(master, pparts, data,
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_wrgg.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_wrgg.c
|
|
@@ -40,8 +40,8 @@ struct wrgg03_header {
|
|
|
|
|
|
static int mtdsplit_parse_wrgg(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
- struct mtd_part_parser_data *data)
|
|
+ struct mtd_partition **pparts,
|
|
+ struct mtd_part_parser_data *data)
|
|
{
|
|
struct wrgg03_header hdr;
|
|
size_t hdr_len, retlen, kernel_ent_size;
|
|
--- a/drivers/mtd/mtdsplit/mtdsplit_minor.c
|
|
+++ b/drivers/mtd/mtdsplit/mtdsplit_minor.c
|
|
@@ -49,7 +49,7 @@ struct minor_header {
|
|
};
|
|
|
|
static int mtdsplit_parse_minor(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
+ struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct minor_header hdr;
|