sf: Move spi_read_cmds_array locally

Since spi_read_cmds_array is used locally in
spi_flash_scan, so move array to locally used
function instead of defining global array.

Tested-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 50011d988991fd77b6695210b24dc43e9590e348..f8180d9f6f0a0a986045a4132bcc27b8393b57c6 100644 (file)
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -29,16 +29,6 @@ static void spi_flash_addr(u32 addr, u8 *cmd)
        cmd[3] = addr >> 0;
 }
 
-/* Read commands array */
-static u8 spi_read_cmds_array[] = {
-       CMD_READ_ARRAY_SLOW,
-       CMD_READ_ARRAY_FAST,
-       CMD_READ_DUAL_OUTPUT_FAST,
-       CMD_READ_DUAL_IO_FAST,
-       CMD_READ_QUAD_OUTPUT_FAST,
-       CMD_READ_QUAD_IO_FAST,
-};
-
 static int read_sr(struct spi_flash *flash, u8 *rs)
 {
        int ret;
@@ -909,9 +899,15 @@ int spi_flash_scan(struct spi_flash *flash)
        struct spi_slave *spi = flash->spi;
        const struct spi_flash_params *params;
        u16 jedec, ext_jedec;
-       u8 idcode[5];
-       u8 cmd;
+       u8 cmd, idcode[5];
        int ret;
+       static u8 spi_read_cmds_array[] = {
+               CMD_READ_ARRAY_SLOW,
+               CMD_READ_ARRAY_FAST,
+               CMD_READ_DUAL_OUTPUT_FAST,
+               CMD_READ_DUAL_IO_FAST,
+               CMD_READ_QUAD_OUTPUT_FAST,
+               CMD_READ_QUAD_IO_FAST };
 
        /* Read the ID codes */
        ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));