memory: ti-aemif: Rename SS to SSTROBE to avoid name conflicts

SS conflicts with compile test build on i386:

    drivers/memory/ti-aemif.c:40:0: warning: "SS" redefined
    In file included from arch/x86/include/uapi/asm/ptrace.h:6:0,
                     from arch/x86/include/asm/ptrace.h:7,
                     from arch/x86/include/asm/math_emu.h:5,
                     from arch/x86/include/asm/processor.h:13,
                     from include/linux/mutex.h:19,
                     from include/linux/notifier.h:14,
                     from include/linux/clk.h:14,
                     from drivers/memory/ti-aemif.c:12:
    arch/x86/include/uapi/asm/ptrace-abi.h:23:0: note: this is the location of the previous definition
     #define SS   16

Use more descriptive name (SSTROBE) to avoid the conflict.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c
index db526dbf71eed4f304a43f5b2dd67c80d07b81d7..159a16f5e7d676373a6b420c3e77cef9589a15ef 100644 (file)
--- a/drivers/memory/ti-aemif.c
+++ b/drivers/memory/ti-aemif.c
@@ -27,7 +27,7 @@
 #define WSTROBE_SHIFT  20
 #define WSETUP_SHIFT   26
 #define EW_SHIFT       30
-#define SS_SHIFT       31
+#define SSTROBE_SHIFT  31
 
 #define TA(x)          ((x) << TA_SHIFT)
 #define RHOLD(x)       ((x) << RHOLD_SHIFT)
@@ -37,7 +37,7 @@
 #define WSTROBE(x)     ((x) << WSTROBE_SHIFT)
 #define WSETUP(x)      ((x) << WSETUP_SHIFT)
 #define EW(x)          ((x) << EW_SHIFT)
-#define SS(x)          ((x) << SS_SHIFT)
+#define SSTROBE(x)     ((x) << SSTROBE_SHIFT)
 
 #define ASIZE_MAX      0x1
 #define TA_MAX         0x3
@@ -48,7 +48,7 @@
 #define WSTROBE_MAX    0x3f
 #define WSETUP_MAX     0xf
 #define EW_MAX         0x1
-#define SS_MAX         0x1
+#define SSTROBE_MAX    0x1
 #define NUM_CS         4
 
 #define TA_VAL(x)      (((x) & TA(TA_MAX)) >> TA_SHIFT)
@@ -59,7 +59,7 @@
 #define WSTROBE_VAL(x) (((x) & WSTROBE(WSTROBE_MAX)) >> WSTROBE_SHIFT)
 #define WSETUP_VAL(x)  (((x) & WSETUP(WSETUP_MAX)) >> WSETUP_SHIFT)
 #define EW_VAL(x)      (((x) & EW(EW_MAX)) >> EW_SHIFT)
-#define SS_VAL(x)      (((x) & SS(SS_MAX)) >> SS_SHIFT)
+#define SSTROBE_VAL(x) (((x) & SSTROBE(SSTROBE_MAX)) >> SSTROBE_SHIFT)
 
 #define NRCSR_OFFSET   0x00
 #define AWCCR_OFFSET   0x04
@@ -67,7 +67,7 @@
 
 #define ACR_ASIZE_MASK 0x3
 #define ACR_EW_MASK    BIT(30)
-#define ACR_SS_MASK    BIT(31)
+#define ACR_SSTROBE_MASK       BIT(31)
 #define ASIZE_16BIT    1
 
 #define CONFIG_MASK    (TA(TA_MAX) | \
@@ -77,7 +77,7 @@
                                WHOLD(WHOLD_MAX) | \
                                WSTROBE(WSTROBE_MAX) | \
                                WSETUP(WSETUP_MAX) | \
-                               EW(EW_MAX) | SS(SS_MAX) | \
+                               EW(EW_MAX) | SSTROBE(SSTROBE_MAX) | \
                                ASIZE_MAX)
 
 /**
@@ -204,7 +204,7 @@ static int aemif_config_abus(struct platform_device *pdev, int csnum)
        if (data->enable_ew)
                set |= ACR_EW_MASK;
        if (data->enable_ss)
-               set |= ACR_SS_MASK;
+               set |= ACR_SSTROBE_MASK;
 
        val = readl(aemif->base + offset);
        val &= ~CONFIG_MASK;
@@ -246,7 +246,7 @@ static void aemif_get_hw_params(struct platform_device *pdev, int csnum)
        data->wstrobe = aemif_cycles_to_nsec(WSTROBE_VAL(val), clk_rate);
        data->wsetup = aemif_cycles_to_nsec(WSETUP_VAL(val), clk_rate);
        data->enable_ew = EW_VAL(val);
-       data->enable_ss = SS_VAL(val);
+       data->enable_ss = SSTROBE_VAL(val);
        data->asize = val & ASIZE_MAX;
 }