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

Commit 13d33dad authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: make ubi_scan_erase_peb static and rename 



The 'ubi_scan_erase_peb()' is used only in scan.c so can be static. Also
re-name it to 'early_erase_peb()' because we tend to use "ubi_" prefix only for
non-static fuction and also because the new name is better.

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

drivers/mtd/ubi/scan.c

+4 −4
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av) 
}



/**

 * ubi_scan_erase_peb - erase a physical eraseblock.

 * early_erase_peb - erase a physical eraseblock.

 * @ubi: UBI device description object

 * @ai: attaching information

 * @pnum: physical eraseblock number to erase;
@@ -679,8 +679,8 @@ void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av) 
 * This function returns zero in case of success and a negative error code in

 * case of failure.

 */

int ubi_scan_erase_peb(struct ubi_device *ubi, const struct ubi_attach_info *ai,

		       int pnum, int ec)

static int early_erase_peb(struct ubi_device *ubi,

			   const struct ubi_attach_info *ai, int pnum, int ec)

{

	int err;

	struct ubi_ec_hdr *ec_hdr;
@@ -748,7 +748,7 @@ struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi, 
		if (aeb->ec == UBI_SCAN_UNKNOWN_EC)

			aeb->ec = ai->mean_ec;



		err = ubi_scan_erase_peb(ubi, ai, aeb->pnum, aeb->ec+1);

		err = early_erase_peb(ubi, ai, aeb->pnum, aeb->ec+1);

		if (err)

			continue;

drivers/mtd/ubi/scan.h

+0 −2
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ struct ubi_ainf_peb *ubi_scan_find_aeb(const 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_attach_info *ai);

int ubi_scan_erase_peb(struct ubi_device *ubi, const struct ubi_attach_info *ai,

		       int pnum, int ec);

struct ubi_attach_info *ubi_scan(struct ubi_device *ubi);

void ubi_scan_destroy_ai(struct ubi_attach_info *ai);