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

Commit 41e0cd9d authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: rename _init_scan functions 



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: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent fbd0107f

drivers/mtd/ubi/build.c

+2 −2
Original line number Diff line number Diff line
@@ -596,11 +596,11 @@ static int attach_by_scanning(struct ubi_device *ubi) 
	if (err)

		goto out_ai;



	err = ubi_wl_init_scan(ubi, ai);

	err = ubi_wl_init(ubi, ai);

	if (err)

		goto out_vtbl;



	err = ubi_eba_init_scan(ubi, ai);

	err = ubi_eba_init(ubi, ai);

	if (err)

		goto out_wl;

drivers/mtd/ubi/eba.c

+3 −3
Original line number Diff line number Diff line
@@ -1167,7 +1167,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to, 
 * print_rsvd_warning - warn about not having enough reserved PEBs.

 * @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

 * decision whether we have to print a warning or not. The algorithm is as

 * 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

 * @ai: attaching information

 *

 * This function returns zero in case of success and a negative error code in

 * 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;

	struct ubi_ainf_volume *av;

drivers/mtd/ubi/ubi.h

+2 −2
Original line number Diff line number Diff line
@@ -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 ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,

		     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 */

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_flush(struct ubi_device *ubi);

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);

int ubi_thread(void *u);

drivers/mtd/ubi/wl.c

+2 −2
Original line number Diff line number Diff line
@@ -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

 * @ai: attaching information

 *

 * This function returns zero in case of success, and a negative error code in

 * 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;

	struct rb_node *rb1, *rb2;