sh: Kill off all timer name clobbering.

Now that dev_name() can be used early, we no longer require a static
string. Kill off all of the superfluous timer names.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

25 files changed, 0 insertions, 242 deletions

diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index 114c7cee7184..9b96457ccc7b 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -128,7 +128,6 @@ static struct platform_device eth_device = {
 };
 
 static struct sh_timer_config cmt0_platform_data = {
-        .name = "CMT0",
         .channel_offset = 0x02,
         .timer_bit = 0,
         .clk = "peripheral_clk",
@@ -138,7 +137,6 @@ static struct sh_timer_config cmt0_platform_data = {
 
 static struct resource cmt0_resources[] = {
         [0] = {
-                .name   = "CMT0",
                 .start  = 0xf84a0072,
                 .end    = 0xf84a0077,
                 .flags  = IORESOURCE_MEM,
@@ -160,7 +158,6 @@ static struct platform_device cmt0_device = {
 };
 
 static struct sh_timer_config cmt1_platform_data = {
-        .name = "CMT1",
         .channel_offset = 0x08,
         .timer_bit = 1,
         .clk = "peripheral_clk",
@@ -170,7 +167,6 @@ static struct sh_timer_config cmt1_platform_data = {
 
 static struct resource cmt1_resources[] = {
         [0] = {
-                .name   = "CMT1",
                 .start  = 0xf84a0078,
                 .end    = 0xf84a007d,
                 .flags  = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
index 8f669dc9b0da..5301450656cc 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
@@ -115,7 +115,6 @@ static DECLARE_INTC_DESC(intc_desc, "mxg", vectors, groups,
                          mask_registers, prio_registers, NULL);
 
 static struct sh_timer_config mtu2_0_platform_data = {
-        .name = "MTU2_0",
         .channel_offset = -0x80,
         .timer_bit = 0,
         .clk = "peripheral_clk",
@@ -124,7 +123,6 @@ static struct sh_timer_config mtu2_0_platform_data = {
 
 static struct resource mtu2_0_resources[] = {
         [0] = {
-                .name   = "MTU2_0",
                 .start  = 0xff801300,
                 .end    = 0xff801326,
                 .flags  = IORESOURCE_MEM,
@@ -146,7 +144,6 @@ static struct platform_device mtu2_0_device = {
 };
 
 static struct sh_timer_config mtu2_1_platform_data = {
-        .name = "MTU2_1",
         .channel_offset = -0x100,
         .timer_bit = 1,
         .clk = "peripheral_clk",
@@ -155,7 +152,6 @@ static struct sh_timer_config mtu2_1_platform_data = {
 
 static struct resource mtu2_1_resources[] = {
         [0] = {
-                .name   = "MTU2_1",
                 .start  = 0xff801380,
                 .end    = 0xff801390,
                 .flags  = IORESOURCE_MEM,
@@ -177,7 +173,6 @@ static struct platform_device mtu2_1_device = {
 };
 
 static struct sh_timer_config mtu2_2_platform_data = {
-        .name = "MTU2_2",
         .channel_offset = 0x80,
         .timer_bit = 2,
         .clk = "peripheral_clk",
@@ -186,7 +181,6 @@ static struct sh_timer_config mtu2_2_platform_data = {
 
 static struct resource mtu2_2_resources[] = {
         [0] = {
-                .name   = "MTU2_2",
                 .start  = 0xff801000,
                 .end    = 0xff80100a,
                 .flags  = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
index 4ccfeb59eb1a..5b07ab57acfd 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
@@ -318,7 +318,6 @@ static struct platform_device rtc_device = {
 };
 
 static struct sh_timer_config mtu2_0_platform_data = {
-        .name = "MTU2_0",
         .channel_offset = -0x80,
         .timer_bit = 0,
         .clk = "peripheral_clk",
@@ -327,7 +326,6 @@ static struct sh_timer_config mtu2_0_platform_data = {
 
 static struct resource mtu2_0_resources[] = {
         [0] = {
-                .name   = "MTU2_0",
                 .start  = 0xfffe4300,
                 .end    = 0xfffe4326,
                 .flags  = IORESOURCE_MEM,
@@ -349,7 +347,6 @@ static struct platform_device mtu2_0_device = {
 };
 
 static struct sh_timer_config mtu2_1_platform_data = {
-        .name = "MTU2_1",
         .channel_offset = -0x100,
         .timer_bit = 1,
         .clk = "peripheral_clk",
@@ -358,7 +355,6 @@ static struct sh_timer_config mtu2_1_platform_data = {
 
 static struct resource mtu2_1_resources[] = {
         [0] = {