[openwrt/openwrt] kernel: rename mtdpart_get_master to mtd_get_master
LEDE Commits
lede-commits at lists.infradead.org
Fri Nov 13 07:21:20 EST 2020
nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f307684ab2e03c37028aff6087d700fb48935648
commit f307684ab2e03c37028aff6087d700fb48935648
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sat Oct 17 17:21:12 2020 +0200
kernel: rename mtdpart_get_master to mtd_get_master
Preparation for supporting newer kernels
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c | 2 +-
.../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 at 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 at 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);
More information about the lede-commits
mailing list