Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66a2af38 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: rename ubi_scan_destroy_ai 



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

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent c87fbd7d

drivers/mtd/ubi/build.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ static int attach_by_scanning(struct ubi_device *ubi) 
	free_internal_volumes(ubi);

	vfree(ubi->vtbl);

out_ai:

	ubi_scan_destroy_ai(ai);

	ubi_destroy_ai(ai);

	return err;

}

drivers/mtd/ubi/scan.c

+3 −3
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ struct ubi_attach_info *ubi_scan(struct ubi_device *ubi) 
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;

drivers/mtd/ubi/scan.h

+1 −1
Original line number Diff line number Diff line
@@ -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__ */