提交 f455578d 编写于 作者: E Ezequiel Garcia 提交者: David Woodhouse

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: NEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: NDaniel Mack <zonque@gmail.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
上级 b7655bcb
...@@ -244,8 +244,6 @@ static struct pxa3xx_nand_flash builtin_flash_types[] = { ...@@ -244,8 +244,6 @@ static struct pxa3xx_nand_flash builtin_flash_types[] = {
/* Define a default flash type setting serve as flash detecting only */ /* Define a default flash type setting serve as flash detecting only */
#define DEFAULT_FLASH_TYPE (&builtin_flash_types[0]) #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_tCH(c) (min((c), 7) << 19)
#define NDTR0_tCS(c) (min((c), 7) << 16) #define NDTR0_tCS(c) (min((c), 7) << 16)
#define NDTR0_tWH(c) (min((c), 7) << 11) #define NDTR0_tWH(c) (min((c), 7) << 11)
...@@ -1091,8 +1089,6 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) ...@@ -1091,8 +1089,6 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
host->row_addr_cycles = 3; host->row_addr_cycles = 3;
else else
host->row_addr_cycles = 2; host->row_addr_cycles = 2;
mtd->name = mtd_names[0];
return nand_scan_tail(mtd); return nand_scan_tail(mtd);
} }
...@@ -1321,6 +1317,8 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) ...@@ -1321,6 +1317,8 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
probe_success = 0; probe_success = 0;
for (cs = 0; cs < pdata->num_cs; cs++) { for (cs = 0; cs < pdata->num_cs; cs++) {
struct mtd_info *mtd = info->host[cs]->mtd; struct mtd_info *mtd = info->host[cs]->mtd;
mtd->name = pdev->name;
info->cs = cs; info->cs = cs;
ret = pxa3xx_nand_scan(mtd); ret = pxa3xx_nand_scan(mtd);
if (ret) { if (ret) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册