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

Commit d7364a27 authored by Huang Shijie's avatar Huang Shijie Committed by Brian Norris
Browse files

mtd: gpmi: delete the gpmi_pre_bbt_scan 



We do not scan the BBT after we call the gpmi_pre_bbt_scan,
so it has lost the meaning of existence.

This patch merges this function into gpmi_init_last, and delete it.
This patch does not change any logic.

Signed-off-by: default avatarHuang Shijie <b32955@freescale.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent df877fb3

drivers/mtd/nand/gpmi-nand/gpmi-nand.c

+5 −15
Original line number Diff line number Diff line
@@ -1562,19 +1562,6 @@ static int gpmi_set_geometry(struct gpmi_nand_data *this) 
	return gpmi_alloc_dma_buffer(this);

}



static int gpmi_pre_bbt_scan(struct gpmi_nand_data  *this)

{

	/* Set up swap_block_mark, must be set before the gpmi_set_geometry() */

	if (GPMI_IS_MX23(this))

		this->swap_block_mark = false;

	else

		this->swap_block_mark = true;



	/* Set up the medium geometry */

	return gpmi_set_geometry(this);



}



static void gpmi_nfc_exit(struct gpmi_nand_data *this)

{

	nand_release(&this->mtd);
@@ -1589,8 +1576,11 @@ static int gpmi_init_last(struct gpmi_nand_data *this) 
	struct bch_geometry *bch_geo = &this->bch_geometry;

	int ret;



	/* Prepare for the BBT scan. */

	ret = gpmi_pre_bbt_scan(this);

	/* Set up swap_block_mark, must be set before the gpmi_set_geometry() */

	this->swap_block_mark = !GPMI_IS_MX23(this);



	/* Set up the medium geometry */

	ret = gpmi_set_geometry(this);

	if (ret)

		return ret;