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

Commit f455578d authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David Woodhouse
Browse files

mtd: nand: pxa3xx: Remove hardcoded mtd name 



There's no advantage in using a hardcoded name for the mtd device.
Instead use the provided by the platform_device.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent b7655bcb

drivers/mtd/nand/pxa3xx_nand.c

+2 −4
Original line number Diff line number Diff line
@@ -244,8 +244,6 @@ static struct pxa3xx_nand_flash builtin_flash_types[] = { 
/* Define a default flash type setting serve as flash detecting only */

#define DEFAULT_FLASH_TYPE (&builtin_flash_types[0])



const char *mtd_names[] = {"pxa3xx_nand-0", "pxa3xx_nand-1", NULL};



#define NDTR0_tCH(c)	(min((c), 7) << 19)

#define NDTR0_tCS(c)	(min((c), 7) << 16)

#define NDTR0_tWH(c)	(min((c), 7) << 11)
@@ -1091,8 +1089,6 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) 
		host->row_addr_cycles = 3;

	else

		host->row_addr_cycles = 2;



	mtd->name = mtd_names[0];

	return nand_scan_tail(mtd);

}
@@ -1321,6 +1317,8 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) 
	probe_success = 0;

	for (cs = 0; cs < pdata->num_cs; cs++) {

		struct mtd_info *mtd = info->host[cs]->mtd;



		mtd->name = pdev->name;

		info->cs = cs;

		ret = pxa3xx_nand_scan(mtd);

		if (ret) {