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

Commit dcd85fdd authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: rename ubi_scan_find_av 



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

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

drivers/mtd/ubi/eba.c

+1 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,7 @@ int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai) 
		for (j = 0; j < vol->reserved_pebs; j++)

			vol->eba_tbl[j] = UBI_LEB_UNMAPPED;



		av = ubi_scan_find_av(ai, idx2vol_id(ubi, i));

		av = ubi_find_av(ai, idx2vol_id(ubi, i));

		if (!av)

			continue;

drivers/mtd/ubi/scan.c

+3 −3
Original line number Diff line number Diff line
@@ -585,14 +585,14 @@ int ubi_add_to_av(struct ubi_device *ubi, struct ubi_attach_info *ai, int pnum, 
}



/**

 * ubi_scan_find_av - find volume in the attaching information.

 * ubi_find_av - find volume in the attaching information.

 * @ai: attaching information

 * @vol_id: the requested volume ID

 *

 * This function returns a pointer to the volume description or %NULL if there

 * are no data about this volume in the attaching information.

 */

struct ubi_ainf_volume *ubi_scan_find_av(const struct ubi_attach_info *ai,

struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,

				    int vol_id)

{

	struct ubi_ainf_volume *av;

drivers/mtd/ubi/scan.h

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static inline void ubi_scan_move_to_list(struct ubi_ainf_volume *av, 


int ubi_add_to_av(struct ubi_device *ubi, struct ubi_attach_info *ai, int pnum,

		  int ec, const struct ubi_vid_hdr *vid_hdr, int bitflips);

struct ubi_ainf_volume *ubi_scan_find_av(const struct ubi_attach_info *ai,

struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,

				    int vol_id);

void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av);

struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi,

drivers/mtd/ubi/vtbl.c

+3 −3
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ static int init_volumes(struct ubi_device *ubi, 
		}



		/* Static volumes only */

		av = ubi_scan_find_av(ai, i);

		av = ubi_find_av(ai, i);

		if (!av) {

			/*

			 * No eraseblocks belonging to this volume found. We
@@ -734,7 +734,7 @@ static int check_scanning_info(const struct ubi_device *ubi, 
	for (i = 0; i < ubi->vtbl_slots + UBI_INT_VOL_COUNT; i++) {

		cond_resched();



		av = ubi_scan_find_av(ai, i);

		av = ubi_find_av(ai, i);

		vol = ubi->volumes[i];

		if (!vol) {

			if (av)
@@ -794,7 +794,7 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *ai) 
	ubi->vtbl_size = ubi->vtbl_slots * UBI_VTBL_RECORD_SIZE;

	ubi->vtbl_size = ALIGN(ubi->vtbl_size, ubi->min_io_size);



	av = ubi_scan_find_av(ai, UBI_LAYOUT_VOLUME_ID);

	av = ubi_find_av(ai, UBI_LAYOUT_VOLUME_ID);

	if (!av) {

		/*

		 * No logical eraseblocks belonging to the layout volume were