Commit 8b311ead authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Boris Brezillon

mtd: nand: remove unused NAND_OWN_BUFFERS flag

The last/only user of NAND_OWN_BUFFERS (cafe_nand.c) has been reworked.
This flag is no longer needed.
Suggested-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent f880b07b
...@@ -5319,35 +5319,30 @@ int nand_scan_tail(struct mtd_info *mtd) ...@@ -5319,35 +5319,30 @@ int nand_scan_tail(struct mtd_info *mtd)
return -EINVAL; return -EINVAL;
} }
if (!(chip->options & NAND_OWN_BUFFERS)) { nbuf = kzalloc(sizeof(*nbuf), GFP_KERNEL);
nbuf = kzalloc(sizeof(*nbuf), GFP_KERNEL); if (!nbuf)
if (!nbuf) return -ENOMEM;
return -ENOMEM;
nbuf->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL);
if (!nbuf->ecccalc) {
ret = -ENOMEM;
goto err_free_nbuf;
}
nbuf->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL); nbuf->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL);
if (!nbuf->ecccode) { if (!nbuf->ecccalc) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_free_nbuf; goto err_free_nbuf;
} }
nbuf->databuf = kmalloc(mtd->writesize + mtd->oobsize, nbuf->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL);
GFP_KERNEL); if (!nbuf->ecccode) {
if (!nbuf->databuf) { ret = -ENOMEM;
ret = -ENOMEM; goto err_free_nbuf;
goto err_free_nbuf; }
}
chip->buffers = nbuf; nbuf->databuf = kmalloc(mtd->writesize + mtd->oobsize, GFP_KERNEL);
} else if (!chip->buffers) { if (!nbuf->databuf) {
return -ENOMEM; ret = -ENOMEM;
goto err_free_nbuf;
} }
chip->buffers = nbuf;
/* /*
* FIXME: some NAND manufacturer drivers expect the first die to be * FIXME: some NAND manufacturer drivers expect the first die to be
* selected when manufacturer->init() is called. They should be fixed * selected when manufacturer->init() is called. They should be fixed
...@@ -5701,7 +5696,7 @@ void nand_cleanup(struct nand_chip *chip) ...@@ -5701,7 +5696,7 @@ void nand_cleanup(struct nand_chip *chip)
/* Free bad block table memory */ /* Free bad block table memory */
kfree(chip->bbt); kfree(chip->bbt);
if (!(chip->options & NAND_OWN_BUFFERS) && chip->buffers) { if (chip->buffers) {
kfree(chip->buffers->databuf); kfree(chip->buffers->databuf);
kfree(chip->buffers->ecccode); kfree(chip->buffers->ecccode);
kfree(chip->buffers->ecccalc); kfree(chip->buffers->ecccalc);
......
...@@ -185,11 +185,6 @@ enum nand_ecc_algo { ...@@ -185,11 +185,6 @@ enum nand_ecc_algo {
/* Non chip related options */ /* Non chip related options */
/* This option skips the bbt scan during initialization. */ /* This option skips the bbt scan during initialization. */
#define NAND_SKIP_BBTSCAN 0x00010000 #define NAND_SKIP_BBTSCAN 0x00010000
/*
* This option is defined if the board driver allocates its own buffers
* (e.g. because it needs them DMA-coherent).
*/
#define NAND_OWN_BUFFERS 0x00020000
/* Chip may not exist, so silence any errors in scan */ /* Chip may not exist, so silence any errors in scan */
#define NAND_SCAN_SILENT_NODEV 0x00040000 #define NAND_SCAN_SILENT_NODEV 0x00040000
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment