domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: drop unused arch_split_mtd_part()

Browse Source 
No single target/arch uses it and most likely there is no need to make
such a potential code target/arch specific.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki
2018-11-20 17:04:48 +01:00
parent f995e143ba
commit c87d47aee8
8 changed files with 18 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
View File

@@ -68,7 +68,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
mtd_add_partition_attrs(new); mtd_add_partition_attrs(new);
@@ -736,6 +741,36 @@ int mtd_del_partition(struct mtd_info *m @@ -736,6 +741,29 @@ int mtd_del_partition(struct mtd_info *m
} }
EXPORT_SYMBOL_GPL(mtd_del_partition); EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -82,11 +82,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+{ +{
+} +}
+ +
+void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
+ int offset, int size)
+{
+}
+
+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
+{ +{
+ static int rootfs_found = 0; + static int rootfs_found = 0;
@@ -98,14 +93,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) && + !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
+ !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL)) + !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL))
+ split_firmware(master, part); + split_firmware(master, part);
+
+ arch_split_mtd_part(master, part->mtd.name, part->offset,
+ part->mtd.size);
+} +}
+
/* /*
* This function, given a master MTD object and a partition table, creates * This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to * and registers slave MTD objects which are bound to the master according to
@@ -767,6 +802,7 @@ int add_mtd_partitions(struct mtd_info * @@ -767,6 +795,7 @@ int add_mtd_partitions(struct mtd_info *
mutex_unlock(&mtd_partitions_mutex); mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&slave->mtd); add_mtd_device(&slave->mtd);
@@ -113,13 +106,3 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
mtd_add_partition_attrs(slave); mtd_add_partition_attrs(slave);
/* Look for subpartitions */ /* Look for subpartitions */
parse_mtd_partitions(&slave->mtd, parts[i].types, NULL); parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -110,5 +110,7 @@ int mtd_add_partition(struct mtd_info *m
long long offset, long long length);
int mtd_del_partition(struct mtd_info *master, int partno);
uint64_t mtd_get_device_size(const struct mtd_info *mtd);
+extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ const char *name, int offset, int size);
#endif

2
target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch
View File

@@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
#else #else
@@ -1119,6 +1153,61 @@ void mtd_part_parser_cleanup(struct mtd_ @@ -1112,6 +1146,61 @@ void mtd_part_parser_cleanup(struct mtd_
} }
} }

4
target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
View File

@@ -17,8 +17,8 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+ run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE); + run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
} }
void __weak arch_split_mtd_part(struct mtd_info *master, const char *name, static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
@@ -797,6 +798,12 @@ static void mtd_partition_split(struct m @@ -792,6 +793,12 @@ static void mtd_partition_split(struct m
if (rootfs_found) if (rootfs_found)
return; return;

6
target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch
View File

@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c
@@ -1232,6 +1232,24 @@ int mtd_is_partition(const struct mtd_in @@ -1225,6 +1225,24 @@ int mtd_is_partition(const struct mtd_in
} }
EXPORT_SYMBOL_GPL(mtd_is_partition); EXPORT_SYMBOL_GPL(mtd_is_partition);
@@ -72,5 +72,5 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd); +struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
+uint64_t mtdpart_get_offset(const struct mtd_info *mtd); +uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
uint64_t mtd_get_device_size(const struct mtd_info *mtd); uint64_t mtd_get_device_size(const struct mtd_info *mtd);
extern void __weak arch_split_mtd_part(struct mtd_info *master,
const char *name, int offset, int size); #endif

23
target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch
View File

@@ -68,7 +68,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
mtd_add_partition_attrs(new); mtd_add_partition_attrs(new);
@@ -728,6 +733,36 @@ int mtd_del_partition(struct mtd_info *m @@ -728,6 +733,29 @@ int mtd_del_partition(struct mtd_info *m
} }
EXPORT_SYMBOL_GPL(mtd_del_partition); EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -82,11 +82,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+{ +{
+} +}
+ +
+void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
+ int offset, int size)
+{
+}
+
+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
+{ +{
+ static int rootfs_found = 0; + static int rootfs_found = 0;
@@ -98,14 +93,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) && + !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
+ !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL)) + !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL))
+ split_firmware(master, part); + split_firmware(master, part);
+
+ arch_split_mtd_part(master, part->mtd.name, part->offset,
+ part->mtd.size);
+} +}
+
/* /*
* This function, given a master MTD object and a partition table, creates * This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to * and registers slave MTD objects which are bound to the master according to
@@ -759,6 +794,7 @@ int add_mtd_partitions(struct mtd_info * @@ -759,6 +787,7 @@ int add_mtd_partitions(struct mtd_info *
mutex_unlock(&mtd_partitions_mutex); mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&slave->mtd); add_mtd_device(&slave->mtd);
@@ -113,13 +106,3 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
mtd_add_partition_attrs(slave); mtd_add_partition_attrs(slave);
/* Look for subpartitions */ /* Look for subpartitions */
parse_mtd_partitions(&slave->mtd, parts[i].types, NULL); parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -110,5 +110,7 @@ int mtd_add_partition(struct mtd_info *m
long long offset, long long length);
int mtd_del_partition(struct mtd_info *master, int partno);
uint64_t mtd_get_device_size(const struct mtd_info *mtd);
+extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ const char *name, int offset, int size);
#endif

2
target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch
View File

@@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
#else #else
@@ -1116,6 +1150,61 @@ void mtd_part_parser_cleanup(struct mtd_ @@ -1109,6 +1143,61 @@ void mtd_part_parser_cleanup(struct mtd_
} }
} }

4
target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
View File

@@ -17,8 +17,8 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+ run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE); + run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
} }
void __weak arch_split_mtd_part(struct mtd_info *master, const char *name, static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
@@ -789,6 +790,12 @@ static void mtd_partition_split(struct m @@ -784,6 +785,12 @@ static void mtd_partition_split(struct m
if (rootfs_found) if (rootfs_found)
return; return;

6
target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch
View File

@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c
@@ -1229,6 +1229,24 @@ int mtd_is_partition(const struct mtd_in @@ -1222,6 +1222,24 @@ int mtd_is_partition(const struct mtd_in
} }
EXPORT_SYMBOL_GPL(mtd_is_partition); EXPORT_SYMBOL_GPL(mtd_is_partition);
@@ -72,5 +72,5 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd); +struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
+uint64_t mtdpart_get_offset(const struct mtd_info *mtd); +uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
uint64_t mtd_get_device_size(const struct mtd_info *mtd); uint64_t mtd_get_device_size(const struct mtd_info *mtd);
extern void __weak arch_split_mtd_part(struct mtd_info *master,
const char *name, int offset, int size); #endif