aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/build.c4
-rw-r--r--drivers/mtd/ubi/scan.c6
-rw-r--r--drivers/mtd/ubi/scan.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 1ae3cfa30809..2a8f26b560f6 100644
--- 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)
608 if (err) 608 if (err)
609 goto out_wl; 609 goto out_wl;
610 610
611 ubi_scan_destroy_ai(ai); 611 ubi_destroy_ai(ai);
612 return 0; 612 return 0;
613 613
614out_wl: 614out_wl:
@@ -617,7 +617,7 @@ out_vtbl:
617 free_internal_volumes(ubi); 617 free_internal_volumes(ubi);
618 vfree(ubi->vtbl); 618 vfree(ubi->vtbl);
619out_ai: 619out_ai:
620 ubi_scan_destroy_ai(ai); 620 ubi_destroy_ai(ai);
621 return err; 621 return err;
622} 622}
623 623
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 2c5a558dc844..daa53a8fca88 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -1203,7 +1203,7 @@ out_vidh:
1203out_ech: 1203out_ech:
1204 kfree(ech); 1204 kfree(ech);
1205out_ai: 1205out_ai:
1206 ubi_scan_destroy_ai(ai); 1206 ubi_destroy_ai(ai);
1207 return ERR_PTR(err); 1207 return ERR_PTR(err);
1208} 1208}
1209 1209
@@ -1242,10 +1242,10 @@ static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
1242} 1242}
1243 1243
1244/** 1244/**
1245 * ubi_scan_destroy_ai - destroy attaching information. 1245 * ubi_destroy_ai - destroy attaching information.
1246 * @ai: attaching information 1246 * @ai: attaching information
1247 */ 1247 */
1248void ubi_scan_destroy_ai(struct ubi_attach_info *ai) 1248void ubi_destroy_ai(struct ubi_attach_info *ai)
1249{ 1249{
1250 struct ubi_ainf_peb *aeb, *aeb_tmp; 1250 struct ubi_ainf_peb *aeb, *aeb_tmp;
1251 struct ubi_ainf_volume *av; 1251 struct ubi_ainf_volume *av;
diff --git a/drivers/mtd/ubi/scan.h b/drivers/mtd/ubi/scan.h
index 72ba24a13a72..a406f5b4ffeb 100644
--- 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);
165struct ubi_ainf_peb *ubi_early_get_peb(struct ubi_device *ubi, 165struct ubi_ainf_peb *ubi_early_get_peb(struct ubi_device *ubi,
166 struct ubi_attach_info *ai); 166 struct ubi_attach_info *ai);
167struct ubi_attach_info *ubi_scan(struct ubi_device *ubi); 167struct ubi_attach_info *ubi_scan(struct ubi_device *ubi);
168void ubi_scan_destroy_ai(struct ubi_attach_info *ai); 168void ubi_destroy_ai(struct ubi_attach_info *ai);
169 169
170#endif /* !__UBI_SCAN_H__ */ 170#endif /* !__UBI_SCAN_H__ */