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

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

mtd: gpmi: rename the functions from gpmi_nfc_* to gpmi_nand_* 



The gpmi_nfc_* is the legacy name. In order to avoid the confusion,
The patch renames the gpmi_nfc_* functions to gpmi_nand_*.

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

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

+5 −5
Original line number Diff line number Diff line
@@ -1561,7 +1561,7 @@ static int gpmi_set_geometry(struct gpmi_nand_data *this) 
	return gpmi_alloc_dma_buffer(this);

}



static void gpmi_nfc_exit(struct gpmi_nand_data *this)

static void gpmi_nand_exit(struct gpmi_nand_data *this)

{

	nand_release(&this->mtd);

	gpmi_free_dma_buffer(this);
@@ -1604,7 +1604,7 @@ static int gpmi_init_last(struct gpmi_nand_data *this) 
	return 0;

}



static int gpmi_nfc_init(struct gpmi_nand_data *this)

static int gpmi_nand_init(struct gpmi_nand_data *this)

{

	struct mtd_info  *mtd = &this->mtd;

	struct nand_chip *chip = &this->nand;
@@ -1668,7 +1668,7 @@ static int gpmi_nfc_init(struct gpmi_nand_data *this) 
	return 0;



err_out:

	gpmi_nfc_exit(this);

	gpmi_nand_exit(this);

	return ret;

}
@@ -1725,7 +1725,7 @@ static int gpmi_nand_probe(struct platform_device *pdev) 
	if (ret)

		goto exit_nfc_init;



	ret = gpmi_nfc_init(this);

	ret = gpmi_nand_init(this);

	if (ret)

		goto exit_nfc_init;
@@ -1745,7 +1745,7 @@ static int gpmi_nand_remove(struct platform_device *pdev) 
{

	struct gpmi_nand_data *this = platform_get_drvdata(pdev);



	gpmi_nfc_exit(this);

	gpmi_nand_exit(this);

	release_resources(this);

	return 0;

}