diff options
| author | Felix Fietkau <nbd@nbd.name> | 2020-10-17 17:21:12 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2020-11-13 13:16:51 +0100 |
| commit | f307684ab2e03c37028aff6087d700fb48935648 (patch) | |
| tree | 0fb0e7a1da81ac0f257b9ae150851ef74680492d | |
| parent | 5d7606562940b52206712bb4bc274ad39521c3e1 (diff) | |
| download | upstream-f307684ab2e03c37028aff6087d700fb48935648.tar.gz upstream-f307684ab2e03c37028aff6087d700fb48935648.tar.bz2 upstream-f307684ab2e03c37028aff6087d700fb48935648.zip | |
kernel: rename mtdpart_get_master to mtd_get_master
Preparation for supporting newer kernels
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c | 2 | ||||
| -rw-r--r-- | target/linux/generic/pending-5.4/404-mtd-add-more-helper-functions.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c index 79e1f73bca..f6353da65b 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c @@ -36,7 +36,7 @@ mtdsplit_parse_squashfs(struct mtd_info *master, if (err) return err; - parent_mtd = mtdpart_get_master(master); + parent_mtd = mtd_get_master(master); part_offset = mtdpart_get_offset(master); part = kzalloc(sizeof(*part), GFP_KERNEL); diff --git a/target/linux/generic/pending-5.4/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-5.4/404-mtd-add-more-helper-functions.patch index 454a37fc22..059a440f0a 100644 --- a/target/linux/generic/pending-5.4/404-mtd-add-more-helper-functions.patch +++ b/target/linux/generic/pending-5.4/404-mtd-add-more-helper-functions.patch @@ -15,14 +15,14 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> } 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)) + return (struct mtd_info *)mtd; + + 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) +{ @@ -69,7 +69,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> int mtd_add_partition(struct mtd_info *master, const char *name, long long offset, long long length); 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 mtd_get_device_size(const struct mtd_info *mtd); |