Skip to content

Commit

Permalink
UBI: rename ubi_scan_rm_volume
Browse files Browse the repository at this point in the history
The old name is not logical anymore - rename it to 'ubi_remove_av()'.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  • Loading branch information
Artem Bityutskiy committed May 20, 2012
1 parent dcd85fd commit d717dc2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/mtd/ubi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -614,11 +614,11 @@ struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,
}

/**
* ubi_scan_rm_volume - delete attaching information about a volume.
* ubi_remove_av - delete attaching information about a volume.
* @ai: attaching information
* @av: the volume attaching information to delete
*/
void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
{
struct rb_node *rb;
struct ubi_ainf_peb *aeb;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/ubi/scan.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ 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_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);
void ubi_remove_av(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_attach_info *ai);
struct ubi_attach_info *ubi_scan(struct ubi_device *ubi);
Expand Down
4 changes: 2 additions & 2 deletions drivers/mtd/ubi/vtbl.c
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ static int check_scanning_info(const struct ubi_device *ubi,
vol = ubi->volumes[i];
if (!vol) {
if (av)
ubi_scan_rm_volume(ai, av);
ubi_remove_av(ai, av);
continue;
}

Expand All @@ -756,7 +756,7 @@ static int check_scanning_info(const struct ubi_device *ubi,
* these eraseblocks.
*/
ubi_msg("finish volume %d removal", av->vol_id);
ubi_scan_rm_volume(ai, av);
ubi_remove_av(ai, av);
} else if (av) {
err = check_av(vol, av);
if (err)
Expand Down

0 comments on commit d717dc2

Please sign in to comment.