sf: eon/stmicro: inline useless ID defines

These defines are used in only one place, so just inline them.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/drivers/mtd/spi/eon.c b/drivers/mtd/spi/eon.c
index 5937b612c76da42cb2f02ee6d5ad1fcc6e983442..806b44e6932e704c02f5b34b12de64c9ac0ec025 100644 (file)
--- a/drivers/mtd/spi/eon.c
+++ b/drivers/mtd/spi/eon.c
@@ -23,8 +23,6 @@
 #define CMD_EN25Q128_DP                0xb9    /* Deep Power-down */
 #define CMD_EN25Q128_RES       0xab    /* Release from DP, and Read Signature */
 
-#define EON_ID_EN25Q128                0x18
-
 struct eon_spi_flash_params {
        u8 idcode1;
        u16 page_size;
@@ -36,7 +34,7 @@ struct eon_spi_flash_params {
 
 static const struct eon_spi_flash_params eon_spi_flash_table[] = {
        {
-               .idcode1 = EON_ID_EN25Q128,
+               .idcode1 = 0x18,
                .page_size = 256,
                .pages_per_sector = 16,
                .sectors_per_block = 16,

diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c
index 9a9d3d401394518e5cc65c89d83c93663729b6dd..a9b33cfd9426f3a6cd71914db66b4d0ec54269c3 100644 (file)
--- a/drivers/mtd/spi/stmicro.c
+++ b/drivers/mtd/spi/stmicro.c
@@ -46,15 +46,6 @@
 #define CMD_M25PXX_DP          0xb9    /* Deep Power-down */
 #define CMD_M25PXX_RES         0xab    /* Release from DP, and Read Signature */
 
-#define STM_ID_M25P10          0x11
-#define STM_ID_M25P16          0x15
-#define STM_ID_M25P20          0x12
-#define STM_ID_M25P32          0x16
-#define STM_ID_M25P40          0x13
-#define STM_ID_M25P64          0x17
-#define STM_ID_M25P80          0x14
-#define STM_ID_M25P128         0x18
-
 struct stmicro_spi_flash_params {
        u8 idcode1;
        u16 page_size;
@@ -65,56 +56,56 @@ struct stmicro_spi_flash_params {
 
 static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
        {
-               .idcode1 = STM_ID_M25P10,
+               .idcode1 = 0x11,
                .page_size = 256,
                .pages_per_sector = 128,
                .nr_sectors = 4,
                .name = "M25P10",
        },
        {
-               .idcode1 = STM_ID_M25P16,
+               .idcode1 = 0x15,
                .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 32,
                .name = "M25P16",
        },
        {
-               .idcode1 = STM_ID_M25P20,
+               .idcode1 = 0x12,
                .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 4,
                .name = "M25P20",
        },
        {
-               .idcode1 = STM_ID_M25P32,
+               .idcode1 = 0x16,
                .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 64,
                .name = "M25P32",
        },
        {
-               .idcode1 = STM_ID_M25P40,
+               .idcode1 = 0x13,
                .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 8,
                .name = "M25P40",
        },
        {
-               .idcode1 = STM_ID_M25P64,
+               .idcode1 = 0x17,
                .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 128,
                .name = "M25P64",
        },
        {
-               .idcode1 = STM_ID_M25P80,
+               .idcode1 = 0x14,
                .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 16,
                .name = "M25P80",
        },
        {
-               .idcode1 = STM_ID_M25P128,
+               .idcode1 = 0x18,
                .page_size = 256,
                .pages_per_sector = 1024,
                .nr_sectors = 64,