kernel: rename mtdpart_get_master to mtd_get_master

Preparation for supporting newer kernels

Signed-off-by: Felix Fietkau <nbd@nbd.name>

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 79e1f73bca15c7509d2d6023ab7458660be3d2ce..f6353da65b0e44a126453e86ee9dc8e4b97e950f 100644 (file)
--- 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;
 
        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);
        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 454a37fc22e1a9c1e0d8052f119fbf36adb0828a..059a440f0aac33f39531e071d274f6f7d97705d5 100644 (file)
--- 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);
  
  }
  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;
 +}
 +{
 +      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)
 +{
 +
 +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);
  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);
  
 +uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
  uint64_t mtd_get_device_size(const struct mtd_info *mtd);