UBI: rename ubi_scan_destroy_ai

The old name is not logical anymore - rename it to 'ubi_destroy_ai()'.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 1ae3cfa30809380be546c05c77d3323496bf4a07..2a8f26b560f6dfeaeabd55c2f843e16199cbbaaa 100644 (file)
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -608,7 +608,7 @@ static int attach_by_scanning(struct ubi_device *ubi)
        if (err)
                goto out_wl;
 
-       ubi_scan_destroy_ai(ai);
+       ubi_destroy_ai(ai);
        return 0;
 
 out_wl:
@@ -617,7 +617,7 @@ out_vtbl:
        free_internal_volumes(ubi);
        vfree(ubi->vtbl);
 out_ai:
-       ubi_scan_destroy_ai(ai);
+       ubi_destroy_ai(ai);
        return err;
 }
 

diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 2c5a558dc84416cb42e48cbf542ea112c62a3952..daa53a8fca88c4a923a4871c39ec8bb2254db557 100644 (file)
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -1203,7 +1203,7 @@ out_vidh:
 out_ech:
        kfree(ech);
 out_ai:
-       ubi_scan_destroy_ai(ai);
+       ubi_destroy_ai(ai);
        return ERR_PTR(err);
 }
 
@@ -1242,10 +1242,10 @@ static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
 }
 
 /**
- * ubi_scan_destroy_ai - destroy attaching information.
+ * ubi_destroy_ai - destroy attaching information.
  * @ai: attaching information
  */
-void ubi_scan_destroy_ai(struct ubi_attach_info *ai)
+void ubi_destroy_ai(struct ubi_attach_info *ai)
 {
        struct ubi_ainf_peb *aeb, *aeb_tmp;
        struct ubi_ainf_volume *av;

diff --git a/drivers/mtd/ubi/scan.h b/drivers/mtd/ubi/scan.h
index 72ba24a13a7238879e1e0e33c65b0607aa1b7af0..a406f5b4ffeb8613a6a945d6b002e92e1836a237 100644 (file)
--- a/drivers/mtd/ubi/scan.h
+++ b/drivers/mtd/ubi/scan.h
@@ -165,6 +165,6 @@ void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av);
 struct ubi_ainf_peb *ubi_early_get_peb(struct ubi_device *ubi,
                                       struct ubi_attach_info *ai);
 struct ubi_attach_info *ubi_scan(struct ubi_device *ubi);
-void ubi_scan_destroy_ai(struct ubi_attach_info *ai);
+void ubi_destroy_ai(struct ubi_attach_info *ai);
 
 #endif /* !__UBI_SCAN_H__ */