diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:28:16 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:28:16 -0500 |
commit | ec0ffe2ee0e0fb9da4409d86bfd72636450f32df (patch) | |
tree | 75ec1d3de64fbadb5ebe5179926eb608dcfb81b6 /arch/sh/kernel/cpu/sh5/setup-sh5.c | |
parent | 214a607a4f5bf5a14dab0304ba350cdaf3916795 (diff) |
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>
Diffstat (limited to 'arch/sh/kernel/cpu/sh5/setup-sh5.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh5/setup-sh5.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c index e7a3c1e4b604..c84ca204240b 100644 --- a/arch/sh/kernel/cpu/sh5/setup-sh5.c +++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c | |||
@@ -68,7 +68,6 @@ static struct platform_device rtc_device = { | |||
68 | #define TMU2_BASE (TMU_BASE + 0x8 + (0xc * 0x2)) | 68 | #define TMU2_BASE (TMU_BASE + 0x8 + (0xc * 0x2)) |
69 | 69 | ||
70 | static struct sh_timer_config tmu0_platform_data = { | 70 | static struct sh_timer_config tmu0_platform_data = { |
71 | .name = "TMU0", | ||
72 | .channel_offset = 0x04, | 71 | .channel_offset = 0x04, |
73 | .timer_bit = 0, | 72 | .timer_bit = 0, |
74 | .clk = "peripheral_clk", | 73 | .clk = "peripheral_clk", |
@@ -77,7 +76,6 @@ static struct sh_timer_config tmu0_platform_data = { | |||
77 | 76 | ||
78 | static struct resource tmu0_resources[] = { | 77 | static struct resource tmu0_resources[] = { |
79 | [0] = { | 78 | [0] = { |
80 | .name = "TMU0", | ||
81 | .start = TMU0_BASE, | 79 | .start = TMU0_BASE, |
82 | .end = TMU0_BASE + 0xc - 1, | 80 | .end = TMU0_BASE + 0xc - 1, |
83 | .flags = IORESOURCE_MEM, | 81 | .flags = IORESOURCE_MEM, |
@@ -99,7 +97,6 @@ static struct platform_device tmu0_device = { | |||
99 | }; | 97 | }; |
100 | 98 | ||
101 | static struct sh_timer_config tmu1_platform_data = { | 99 | static struct sh_timer_config tmu1_platform_data = { |
102 | .name = "TMU1", | ||
103 | .channel_offset = 0x10, | 100 | .channel_offset = 0x10, |
104 | .timer_bit = 1, | 101 | .timer_bit = 1, |
105 | .clk = "peripheral_clk", | 102 | .clk = "peripheral_clk", |
@@ -108,7 +105,6 @@ static struct sh_timer_config tmu1_platform_data = { | |||
108 | 105 | ||
109 | static struct resource tmu1_resources[] = { | 106 | static struct resource tmu1_resources[] = { |
110 | [0] = { | 107 | [0] = { |
111 | .name = "TMU1", | ||
112 | .start = TMU1_BASE, | 108 | .start = TMU1_BASE, |
113 | .end = TMU1_BASE + 0xc - 1, | 109 | .end = TMU1_BASE + 0xc - 1, |
114 | .flags = IORESOURCE_MEM, | 110 | .flags = IORESOURCE_MEM, |
@@ -130,7 +126,6 @@ static struct platform_device tmu1_device = { | |||
130 | }; | 126 | }; |
131 | 127 | ||
132 | static struct sh_timer_config tmu2_platform_data = { | 128 | static struct sh_timer_config tmu2_platform_data = { |
133 | .name = "TMU2", | ||
134 | .channel_offset = 0x1c, | 129 | .channel_offset = 0x1c, |
135 | .timer_bit = 2, | 130 | .timer_bit = 2, |
136 | .clk = "peripheral_clk", | 131 | .clk = "peripheral_clk", |
@@ -138,7 +133,6 @@ static struct sh_timer_config tmu2_platform_data = { | |||
138 | 133 | ||
139 | static struct resource tmu2_resources[] = { | 134 | static struct resource tmu2_resources[] = { |
140 | [0] = { | 135 | [0] = { |
141 | .name = "TMU2", | ||
142 | .start = TMU2_BASE, | 136 | .start = TMU2_BASE, |
143 | .end = TMU2_BASE + 0xc - 1, | 137 | .end = TMU2_BASE + 0xc - 1, |
144 | .flags = IORESOURCE_MEM, | 138 | .flags = IORESOURCE_MEM, |