sf: Fix build warnings

Move few macro definations to spi_flash local headers:
In file included from spi_flash.c:14:0:
include/spi_flash.h:42:12: warning: 'spi_write_cmds_array' defined but not used [-Wunused-variable]
include/spi_flash.h:59:12: warning: 'spi_read_cmds_array' defined but not used [-Wunused-variable]
In file included from zynq_qspi.c:20:0:
include/spi_flash.h:42:12: warning: 'spi_write_cmds_array' defined but not used [-Wunused-variable]
include/spi_flash.h:59:12: warning: 'spi_read_cmds_array' defined but not used [-Wunused-variable]
In file included from cmd_sf.c:11:0:
include/spi_flash.h:42:12: warning: 'spi_write_cmds_array' defined but not used [-Wunused-variable]
include/spi_flash.h:59:12: warning: 'spi_read_cmds_array' defined but not used [-Wunused-variable]
In file included from env_sf.c:31:0:
include/spi_flash.h:42:12: warning: 'spi_write_cmds_array' defined but not used [-Wunused-variable]
include/spi_flash.h:59:12: warning: 'spi_read_cmds_array' defined but not used [-Wunused-variable]

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h
index 4d4442343aae719ef0ec396f7d3d58b2a3610598..869aa49d8ef5139928313435f3906f2ef85ec94b 100644 (file)
--- a/drivers/mtd/spi/spi_flash_internal.h
+++ b/drivers/mtd/spi/spi_flash_internal.h
@@ -30,6 +30,28 @@
 #define CMD_ERASE_64K                  0xd8
 #define CMD_ERASE_CHIP                 0xc7
 
+/* Write commands */
+#define CMD_QUAD_PAGE_PROGRAM          0x32
+
+static const u32 spi_write_cmds_array[] = {
+       CMD_PAGE_PROGRAM,
+       CMD_QUAD_PAGE_PROGRAM,
+};
+
+/* Read commands */
+#define CMD_READ_ARRAY_SLOW            0x03
+#define CMD_READ_DUAL_OUTPUT_FAST      0x3b
+#define CMD_READ_DUAL_IO_FAST          0xbb
+#define CMD_READ_QUAD_OUTPUT_FAST      0x6b
+
+static const u32 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,
+};
+
 #define SPI_FLASH_16MB_BOUN            0x1000000
 
 /* Manufacture ID's */

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 09f0cc846dee73855628bd1ee25c78190d2bab3a..a6091f8063ef26255cade21af94f752f775bc744 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -35,35 +35,15 @@ enum spi_con_topology {
        MODE_DUAL_PARALLEL,
 };
 
-/* Write commands */
+/* Default read and write commands */
 #define CMD_PAGE_PROGRAM               0x02
-#define CMD_QUAD_PAGE_PROGRAM          0x32
-
-static u32 spi_write_cmds_array[] = {
-       CMD_PAGE_PROGRAM,
-       CMD_QUAD_PAGE_PROGRAM,
-};
+#define CMD_READ_ARRAY_FAST            0x0b
 
 enum spi_write_cmds {
        PAGE_PROGRAM = 1 << 0,
        QUAD_PAGE_PROGRAM = 1 << 1,
 };
 
-/* Read commands */
-#define CMD_READ_ARRAY_SLOW            0x03
-#define CMD_READ_ARRAY_FAST            0x0b
-#define CMD_READ_DUAL_OUTPUT_FAST      0x3b
-#define CMD_READ_DUAL_IO_FAST          0xbb
-#define CMD_READ_QUAD_OUTPUT_FAST      0x6b
-
-static u32 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,
-};
-
 enum spi_read_cmds {
        ARRAY_SLOW = 1 << 0,
        ARRAY_FAST = 1 << 1,