mtd: nand: mxc: remove now unused code
authorSascha Hauer <s.hauer@pengutronix.de>
Wed, 17 Jan 2018 11:32:13 +0000 (12:32 +0100)
committerBoris Brezillon <boris.brezillon@bootlin.com>
Mon, 12 Feb 2018 22:35:58 +0000 (23:35 +0100)
Since we now have our own read_page/write_page functions
mxc_nand_command() will no longer be called with NAND_CMD_READ0,
NAND_CMD_READOOB, NAND_CMD_SEQIN and NAND_CMD_PAGEPROG. Remove
the code handling these commands.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
drivers/mtd/nand/mxc_nand.c

index a7c4fdd..87b5ee6 100644 (file)
@@ -1391,57 +1391,6 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
                mxc_do_addr_cycle(mtd, column, page_addr);
                break;
 
-       case NAND_CMD_READ0:
-       case NAND_CMD_READOOB:
-               if (command == NAND_CMD_READ0)
-                       host->buf_start = column;
-               else
-                       host->buf_start = column + mtd->writesize;
-
-               command = NAND_CMD_READ0; /* only READ0 is valid */
-
-               host->devtype_data->send_cmd(host, command, false);
-               WARN_ONCE(column < 0,
-                         "Unexpected column/row value (cmd=%u, col=%d, row=%d)\n",
-                         command, column, page_addr);
-               mxc_do_addr_cycle(mtd, 0, page_addr);
-
-               if (mtd->writesize > 512)
-                       host->devtype_data->send_cmd(host,
-                                       NAND_CMD_READSTART, true);
-
-               host->devtype_data->send_page(mtd, NFC_OUTPUT);
-
-               memcpy32_fromio(host->data_buf, host->main_area0,
-                               mtd->writesize);
-               copy_spare(mtd, true, host->data_buf + mtd->writesize);
-               break;
-
-       case NAND_CMD_SEQIN:
-               if (column >= mtd->writesize)
-                       /* call ourself to read a page */
-                       mxc_nand_command(mtd, NAND_CMD_READ0, 0, page_addr);
-
-               host->buf_start = column;
-
-               host->devtype_data->send_cmd(host, command, false);
-               WARN_ONCE(column < -1,
-                         "Unexpected column/row value (cmd=%u, col=%d, row=%d)\n",
-                         command, column, page_addr);
-               mxc_do_addr_cycle(mtd, 0, page_addr);
-               break;
-
-       case NAND_CMD_PAGEPROG:
-               memcpy32_toio(host->main_area0, host->data_buf, mtd->writesize);
-               copy_spare(mtd, false, host->data_buf + mtd->writesize);
-               host->devtype_data->send_page(mtd, NFC_INPUT);
-               host->devtype_data->send_cmd(host, command, true);
-               WARN_ONCE(column != -1 || page_addr != -1,
-                         "Unexpected column/row value (cmd=%u, col=%d, row=%d)\n",
-                         command, column, page_addr);
-               mxc_do_addr_cycle(mtd, column, page_addr);
-               break;
-
        case NAND_CMD_READID:
                host->devtype_data->send_cmd(host, command, true);
                mxc_do_addr_cycle(mtd, column, page_addr);