EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kernel: rename mtdpart_get_master to mtd_get_master

Browse Source 
Preparation for supporting newer kernels

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2020-10-17 17:21:12 +02:00
parent 5d76065629
commit f307684ab2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c
View File

@ -36,7 +36,7 @@ mtdsplit_parse_squashfs(struct mtd_info *master,
if (err) if (err)
return err; return err;
parent_mtd = mtdpart_get_master(master); parent_mtd = mtd_get_master(master);
part_offset = mtdpart_get_offset(master); part_offset = mtdpart_get_offset(master);
part = kzalloc(sizeof(*part), GFP_KERNEL); part = kzalloc(sizeof(*part), GFP_KERNEL);

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

@ -15,14 +15,14 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
} }
EXPORT_SYMBOL_GPL(mtd_is_partition); EXPORT_SYMBOL_GPL(mtd_is_partition);
+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd) +struct mtd_info *mtd_get_master(const struct mtd_info *mtd)
+{ +{
+ if (!mtd_is_partition(mtd)) + if (!mtd_is_partition(mtd))
+ return (struct mtd_info *)mtd; + return (struct mtd_info *)mtd;
+ +
+ return mtd_to_part(mtd)->parent; + return mtd_to_part(mtd)->parent;
+} +}
+EXPORT_SYMBOL_GPL(mtdpart_get_master); +EXPORT_SYMBOL_GPL(mtd_get_master);
+ +
+uint64_t mtdpart_get_offset(const struct mtd_info *mtd) +uint64_t mtdpart_get_offset(const struct mtd_info *mtd)
+{ +{
@ -69,7 +69,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
int mtd_add_partition(struct mtd_info *master, const char *name, int mtd_add_partition(struct mtd_info *master, const char *name,
long long offset, long long length); long long offset, long long length);
int mtd_del_partition(struct mtd_info *master, int partno); int mtd_del_partition(struct mtd_info *master, int partno);
+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd); +struct mtd_info *mtd_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);