evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UBI: rename ubi_scan_find_av

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

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Artem Bityutskiy 2012-05-17 15:33:20 +03:00
parent 3561188ac2
commit dcd85fdd10
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mtd/ubi/eba.c
View file

@ -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++) for (j = 0; j < vol->reserved_pebs; j++)
vol->eba_tbl[j] = UBI_LEB_UNMAPPED; 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) if (!av)
continue; continue;

6
drivers/mtd/ubi/scan.c
View file

@ -585,15 +585,15 @@ 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 * @ai: attaching information
* @vol_id: the requested volume ID * @vol_id: the requested volume ID
* *
* This function returns a pointer to the volume description or %NULL if there * This function returns a pointer to the volume description or %NULL if there
* are no data about this volume in the attaching information. * 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) int vol_id)
{ {
struct ubi_ainf_volume *av; struct ubi_ainf_volume *av;
struct rb_node *p = ai->volumes.rb_node; struct rb_node *p = ai->volumes.rb_node;

4
drivers/mtd/ubi/scan.h
View file

@ -159,8 +159,8 @@ 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 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); 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); int vol_id);
void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av); 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, struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi,
struct ubi_attach_info *ai); struct ubi_attach_info *ai);

6
drivers/mtd/ubi/vtbl.c
View file

@ -591,7 +591,7 @@ static int init_volumes(struct ubi_device *ubi,
} }
/* Static volumes only */ /* Static volumes only */
av = ubi_scan_find_av(ai, i); av = ubi_find_av(ai, i);
if (!av) { if (!av) {
/* /*
* No eraseblocks belonging to this volume found. We * 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++) { for (i = 0; i < ubi->vtbl_slots + UBI_INT_VOL_COUNT; i++) {
cond_resched(); cond_resched();
av = ubi_scan_find_av(ai, i); av = ubi_find_av(ai, i);
vol = ubi->volumes[i]; vol = ubi->volumes[i];
if (!vol) { if (!vol) {
if (av) 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 = ubi->vtbl_slots * UBI_VTBL_RECORD_SIZE;
ubi->vtbl_size = ALIGN(ubi->vtbl_size, ubi->min_io_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) { if (!av) {
/* /*
* No logical eraseblocks belonging to the layout volume were * No logical eraseblocks belonging to the layout volume were