xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBI: rename _init_scan functions

Browse Source 
We have a couple of initialization funcntionsn left which have "_scan" suffic -
rename them:

ubi_eba_init_scan() -> ubi_eba_init()
ubi_wl_init_scan() -> ubi_wl_init()

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Artem Bityutskiy
2012-05-17 21:05:33 +03:00
parent fbd0107f4d
commit 41e0cd9d4e
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/ubi/build.c
View File

@@ -596,11 +596,11 @@ static int attach_by_scanning(struct ubi_device *ubi)
if (err) if (err)
goto out_ai; goto out_ai;
err = ubi_wl_init_scan(ubi, ai); err = ubi_wl_init(ubi, ai);
if (err) if (err)
goto out_vtbl; goto out_vtbl;
err = ubi_eba_init_scan(ubi, ai); err = ubi_eba_init(ubi, ai);
if (err) if (err)
goto out_wl; goto out_wl;

6
drivers/mtd/ubi/eba.c
View File

@@ -1167,7 +1167,7 @@ out_unlock_leb:
* print_rsvd_warning - warn about not having enough reserved PEBs. * print_rsvd_warning - warn about not having enough reserved PEBs.
* @ubi: UBI device description object * @ubi: UBI device description object
* *
* This is a helper function for 'ubi_eba_init_scan()' which is called when UBI * This is a helper function for 'ubi_eba_init()' which is called when UBI
* cannot reserve enough PEBs for bad block handling. This function makes a * cannot reserve enough PEBs for bad block handling. This function makes a
* decision whether we have to print a warning or not. The algorithm is as * decision whether we have to print a warning or not. The algorithm is as
* follows: * follows:
@@ -1205,14 +1205,14 @@ static void print_rsvd_warning(struct ubi_device *ubi,
} }
/** /**
* ubi_eba_init_scan - initialize the EBA sub-system using attaching information. * ubi_eba_init - initialize the EBA sub-system using attaching information.
* @ubi: UBI device description object * @ubi: UBI device description object
* @ai: attaching information * @ai: attaching information
* *
* This function returns zero in case of success and a negative error code in * This function returns zero in case of success and a negative error code in
* case of failure. * case of failure.
*/ */
int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai) int ubi_eba_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
{ {
int i, j, err, num_volumes; int i, j, err, num_volumes;
struct ubi_ainf_volume *av; struct ubi_ainf_volume *av;

4
drivers/mtd/ubi/ubi.h
View File

@@ -529,14 +529,14 @@ int ubi_eba_atomic_leb_change(struct ubi_device *ubi, struct ubi_volume *vol,
int lnum, const void *buf, int len); int lnum, const void *buf, int len);
int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to, int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
struct ubi_vid_hdr *vid_hdr); struct ubi_vid_hdr *vid_hdr);
int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai); int ubi_eba_init(struct ubi_device *ubi, struct ubi_attach_info *ai);
/* wl.c */ /* wl.c */
int ubi_wl_get_peb(struct ubi_device *ubi); int ubi_wl_get_peb(struct ubi_device *ubi);
int ubi_wl_put_peb(struct ubi_device *ubi, int pnum, int torture); int ubi_wl_put_peb(struct ubi_device *ubi, int pnum, int torture);
int ubi_wl_flush(struct ubi_device *ubi); int ubi_wl_flush(struct ubi_device *ubi);
int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum); int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum);
int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai); int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai);
void ubi_wl_close(struct ubi_device *ubi); void ubi_wl_close(struct ubi_device *ubi);
int ubi_thread(void *u); int ubi_thread(void *u);

4
drivers/mtd/ubi/wl.c
View File

@@ -1373,14 +1373,14 @@ static void cancel_pending(struct ubi_device *ubi)
} }
/** /**
* ubi_wl_init_scan - initialize the WL sub-system using attaching information. * ubi_wl_init - initialize the WL sub-system using attaching information.
* @ubi: UBI device description object * @ubi: UBI device description object
* @ai: attaching information * @ai: attaching information
* *
* This function returns zero in case of success, and a negative error code in * This function returns zero in case of success, and a negative error code in
* case of failure. * case of failure.
*/ */
int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai) int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
{ {
int err, i; int err, i;
struct rb_node *rb1, *rb2; struct rb_node *rb1, *rb2;