OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mtd: nand: cmx270: use the mtd instance embedded in struct nand_chip 

struct nand_chip now embeds an mtd device. Make use of this mtd instance.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
[Brian: dropped a defunct comment]
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Boris BREZILLON 2015-12-10 08:59:56 +01:00 committed by Brian Norris
parent 8cd65d1a63
commit 2afd14f927
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/mtd/nand/cmx270_nand.c
View File

@ -160,10 +160,8 @@ static int __init cmx270_init(void)
gpio_direction_input(GPIO_NAND_RB); gpio_direction_input(GPIO_NAND_RB);
/* Allocate memory for MTD device structure and private data */ /* Allocate memory for MTD device structure and private data */
cmx270_nand_mtd = kzalloc(sizeof(struct mtd_info) + this = kzalloc(sizeof(struct nand_chip), GFP_KERNEL);
sizeof(struct nand_chip), if (!this) {
GFP_KERNEL);
if (!cmx270_nand_mtd) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_kzalloc; goto err_kzalloc;
} }
@ -175,8 +173,7 @@ static int __init cmx270_init(void)
goto err_ioremap; goto err_ioremap;
} }
/* Get pointer to private data */ cmx270_nand_mtd = nand_to_mtd(this);
this = (struct nand_chip *)(&cmx270_nand_mtd[1]);
/* Link the private data with the MTD structure */ /* Link the private data with the MTD structure */
cmx270_nand_mtd->owner = THIS_MODULE; cmx270_nand_mtd->owner = THIS_MODULE;
@ -216,7 +213,7 @@ static int __init cmx270_init(void)
err_scan: err_scan:
iounmap(cmx270_nand_io); iounmap(cmx270_nand_io);
err_ioremap: err_ioremap:
kfree(cmx270_nand_mtd); kfree(this);
err_kzalloc: err_kzalloc:
gpio_free(GPIO_NAND_RB); gpio_free(GPIO_NAND_RB);
err_gpio_request: err_gpio_request:
@ -240,8 +237,7 @@ static void __exit cmx270_cleanup(void)
iounmap(cmx270_nand_io); iounmap(cmx270_nand_io);
/* Free the MTD device structure */ kfree(mtd_to_nand(cmx270_nand_mtd));
kfree (cmx270_nand_mtd);
} }
module_exit(cmx270_cleanup); module_exit(cmx270_cleanup);