mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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: Huang Shijie <b32955@freescale.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
parent
df877fb3f5
commit
d7364a2710
1 changed files with 5 additions and 15 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue