[PATCH] ubi: fastmap: Remove 'ubi' parameter of 'destroy_ai()'
Shmulik Ladkani
shmulik.ladkani at gmail.com
Thu Jun 28 09:52:39 EDT 2012
From: Shmulik Ladkani <shmulik.ladkani at gmail.com>
The 'ubi' argument of 'destroy_ai' was added during fastmap development,
but it is no longer used.
Signed-off-by: Shmulik Ladkani <shmulik.ladkani at gmail.com>
---
Applies to linux-ubi.git fastmap
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 3d9be42..019fbd3 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -97,7 +97,7 @@
* it that way, or re-structure all the code. :-)
*/
static int self_check_ai(struct ubi_device *ubi, struct ubi_attach_info *ai);
-static void destroy_ai(struct ubi_device *ubi, struct ubi_attach_info *ai);
+static void destroy_ai(struct ubi_attach_info *ai);
/* Temporary variables used during scanning */
static struct ubi_ec_hdr *ech;
@@ -1219,7 +1219,7 @@ out_vidh:
out_ech:
kfree(ech);
out_ai:
- destroy_ai(ubi, ai);
+ destroy_ai(ai);
return err;
}
@@ -1280,7 +1280,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan)
*/
err = ubi_scan_fastmap(ubi, ai);
if (err > 0) {
- destroy_ai(ubi, ai);
+ destroy_ai(ai);
ai = alloc_ai();
if (!ai)
return -ENOMEM;
@@ -1334,10 +1334,10 @@ int ubi_attach(struct ubi_device *ubi, int force_scan)
}
self_check_eba(ubi, ai, scan_ai);
- destroy_ai(ubi, scan_ai);
+ destroy_ai(scan_ai);
}
- destroy_ai(ubi, ai);
+ destroy_ai(ai);
return 0;
out_wl:
@@ -1346,7 +1346,7 @@ out_vtbl:
ubi_free_internal_volumes(ubi);
vfree(ubi->vtbl);
out_ai:
- destroy_ai(ubi, ai);
+ destroy_ai(ai);
return err;
}
@@ -1385,10 +1385,9 @@ static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
/**
* destroy_ai - destroy attaching information.
- * @ubi: UBI device object
* @ai: attaching information
*/
-static void destroy_ai(struct ubi_device *ubi, struct ubi_attach_info *ai)
+static void destroy_ai(struct ubi_attach_info *ai)
{
struct ubi_ainf_peb *aeb, *aeb_tmp;
struct ubi_ainf_volume *av;
More information about the linux-mtd
mailing list