Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec0ffe2e authored by Paul Mundt's avatar Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 214a607a

arch/sh/kernel/cpu/sh2/setup-sh7619.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -128,7 +128,6 @@ static struct platform_device eth_device = { 
};

};





static struct sh_timer_config cmt0_platform_data = {

static struct sh_timer_config cmt0_platform_data = {

	.name = "CMT0",

	.channel_offset = 0x02,

	.channel_offset = 0x02,

	.timer_bit = 0,

	.timer_bit = 0,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -138,7 +137,6 @@ static struct sh_timer_config cmt0_platform_data = { 




static struct resource cmt0_resources[] = {

static struct resource cmt0_resources[] = {

	[0] = {

	[0] = {

		.name	= "CMT0",

		.start	= 0xf84a0072,

		.start	= 0xf84a0072,

		.end	= 0xf84a0077,

		.end	= 0xf84a0077,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -160,7 +158,6 @@ static struct platform_device cmt0_device = { 
};

};





static struct sh_timer_config cmt1_platform_data = {

static struct sh_timer_config cmt1_platform_data = {

	.name = "CMT1",

	.channel_offset = 0x08,

	.channel_offset = 0x08,

	.timer_bit = 1,

	.timer_bit = 1,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -170,7 +167,6 @@ static struct sh_timer_config cmt1_platform_data = { 




static struct resource cmt1_resources[] = {

static struct resource cmt1_resources[] = {

	[0] = {

	[0] = {

		.name	= "CMT1",

		.start	= 0xf84a0078,

		.start	= 0xf84a0078,

		.end	= 0xf84a007d,

		.end	= 0xf84a007d,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

arch/sh/kernel/cpu/sh2a/setup-mxg.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -115,7 +115,6 @@ static DECLARE_INTC_DESC(intc_desc, "mxg", vectors, groups, 
			 mask_registers, prio_registers, NULL);

			 mask_registers, prio_registers, NULL);





static struct sh_timer_config mtu2_0_platform_data = {

static struct sh_timer_config mtu2_0_platform_data = {

	.name = "MTU2_0",

	.channel_offset = -0x80,

	.channel_offset = -0x80,

	.timer_bit = 0,

	.timer_bit = 0,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -124,7 +123,6 @@ static struct sh_timer_config mtu2_0_platform_data = { 




static struct resource mtu2_0_resources[] = {

static struct resource mtu2_0_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_0",

		.start	= 0xff801300,

		.start	= 0xff801300,

		.end	= 0xff801326,

		.end	= 0xff801326,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -146,7 +144,6 @@ static struct platform_device mtu2_0_device = { 
};

};





static struct sh_timer_config mtu2_1_platform_data = {

static struct sh_timer_config mtu2_1_platform_data = {

	.name = "MTU2_1",

	.channel_offset = -0x100,

	.channel_offset = -0x100,

	.timer_bit = 1,

	.timer_bit = 1,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -155,7 +152,6 @@ static struct sh_timer_config mtu2_1_platform_data = { 




static struct resource mtu2_1_resources[] = {

static struct resource mtu2_1_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_1",

		.start	= 0xff801380,

		.start	= 0xff801380,

		.end	= 0xff801390,

		.end	= 0xff801390,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -177,7 +173,6 @@ static struct platform_device mtu2_1_device = { 
};

};





static struct sh_timer_config mtu2_2_platform_data = {

static struct sh_timer_config mtu2_2_platform_data = {

	.name = "MTU2_2",

	.channel_offset = 0x80,

	.channel_offset = 0x80,

	.timer_bit = 2,

	.timer_bit = 2,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -186,7 +181,6 @@ static struct sh_timer_config mtu2_2_platform_data = { 




static struct resource mtu2_2_resources[] = {

static struct resource mtu2_2_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_2",

		.start	= 0xff801000,

		.start	= 0xff801000,

		.end	= 0xff80100a,

		.end	= 0xff80100a,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

arch/sh/kernel/cpu/sh2a/setup-sh7201.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -318,7 +318,6 @@ static struct platform_device rtc_device = { 
};

};





static struct sh_timer_config mtu2_0_platform_data = {

static struct sh_timer_config mtu2_0_platform_data = {

	.name = "MTU2_0",

	.channel_offset = -0x80,

	.channel_offset = -0x80,

	.timer_bit = 0,

	.timer_bit = 0,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -327,7 +326,6 @@ static struct sh_timer_config mtu2_0_platform_data = { 




static struct resource mtu2_0_resources[] = {

static struct resource mtu2_0_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_0",

		.start	= 0xfffe4300,

		.start	= 0xfffe4300,

		.end	= 0xfffe4326,

		.end	= 0xfffe4326,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -349,7 +347,6 @@ static struct platform_device mtu2_0_device = { 
};

};





static struct sh_timer_config mtu2_1_platform_data = {

static struct sh_timer_config mtu2_1_platform_data = {

	.name = "MTU2_1",

	.channel_offset = -0x100,

	.channel_offset = -0x100,

	.timer_bit = 1,

	.timer_bit = 1,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -358,7 +355,6 @@ static struct sh_timer_config mtu2_1_platform_data = { 




static struct resource mtu2_1_resources[] = {

static struct resource mtu2_1_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_1",

		.start	= 0xfffe4380,

		.start	= 0xfffe4380,

		.end	= 0xfffe4390,

		.end	= 0xfffe4390,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -380,7 +376,6 @@ static struct platform_device mtu2_1_device = { 
};

};





static struct sh_timer_config mtu2_2_platform_data = {

static struct sh_timer_config mtu2_2_platform_data = {

	.name = "MTU2_2",

	.channel_offset = 0x80,

	.channel_offset = 0x80,

	.timer_bit = 2,

	.timer_bit = 2,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -389,7 +384,6 @@ static struct sh_timer_config mtu2_2_platform_data = { 




static struct resource mtu2_2_resources[] = {

static struct resource mtu2_2_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_2",

		.start	= 0xfffe4000,

		.start	= 0xfffe4000,

		.end	= 0xfffe400a,

		.end	= 0xfffe400a,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

arch/sh/kernel/cpu/sh2a/setup-sh7203.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -234,7 +234,6 @@ static struct platform_device scif3_device = { 
};

};





static struct sh_timer_config cmt0_platform_data = {

static struct sh_timer_config cmt0_platform_data = {

	.name = "CMT0",

	.channel_offset = 0x02,

	.channel_offset = 0x02,

	.timer_bit = 0,

	.timer_bit = 0,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -244,7 +243,6 @@ static struct sh_timer_config cmt0_platform_data = { 




static struct resource cmt0_resources[] = {

static struct resource cmt0_resources[] = {

	[0] = {

	[0] = {

		.name	= "CMT0",

		.start	= 0xfffec002,

		.start	= 0xfffec002,

		.end	= 0xfffec007,

		.end	= 0xfffec007,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -266,7 +264,6 @@ static struct platform_device cmt0_device = { 
};

};





static struct sh_timer_config cmt1_platform_data = {

static struct sh_timer_config cmt1_platform_data = {

	.name = "CMT1",

	.channel_offset = 0x08,

	.channel_offset = 0x08,

	.timer_bit = 1,

	.timer_bit = 1,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -276,7 +273,6 @@ static struct sh_timer_config cmt1_platform_data = { 




static struct resource cmt1_resources[] = {

static struct resource cmt1_resources[] = {

	[0] = {

	[0] = {

		.name	= "CMT1",

		.start	= 0xfffec008,

		.start	= 0xfffec008,

		.end	= 0xfffec00d,

		.end	= 0xfffec00d,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -298,7 +294,6 @@ static struct platform_device cmt1_device = { 
};

};





static struct sh_timer_config mtu2_0_platform_data = {

static struct sh_timer_config mtu2_0_platform_data = {

	.name = "MTU2_0",

	.channel_offset = -0x80,

	.channel_offset = -0x80,

	.timer_bit = 0,

	.timer_bit = 0,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -307,7 +302,6 @@ static struct sh_timer_config mtu2_0_platform_data = { 




static struct resource mtu2_0_resources[] = {

static struct resource mtu2_0_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_0",

		.start	= 0xfffe4300,

		.start	= 0xfffe4300,

		.end	= 0xfffe4326,

		.end	= 0xfffe4326,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -329,7 +323,6 @@ static struct platform_device mtu2_0_device = { 
};

};





static struct sh_timer_config mtu2_1_platform_data = {

static struct sh_timer_config mtu2_1_platform_data = {

	.name = "MTU2_1",

	.channel_offset = -0x100,

	.channel_offset = -0x100,

	.timer_bit = 1,

	.timer_bit = 1,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -338,7 +331,6 @@ static struct sh_timer_config mtu2_1_platform_data = { 




static struct resource mtu2_1_resources[] = {

static struct resource mtu2_1_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_1",

		.start	= 0xfffe4380,

		.start	= 0xfffe4380,

		.end	= 0xfffe4390,

		.end	= 0xfffe4390,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

arch/sh/kernel/cpu/sh2a/setup-sh7206.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -194,7 +194,6 @@ static struct platform_device scif3_device = { 
};

};





static struct sh_timer_config cmt0_platform_data = {

static struct sh_timer_config cmt0_platform_data = {

	.name = "CMT0",

	.channel_offset = 0x02,

	.channel_offset = 0x02,

	.timer_bit = 0,

	.timer_bit = 0,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -204,7 +203,6 @@ static struct sh_timer_config cmt0_platform_data = { 




static struct resource cmt0_resources[] = {

static struct resource cmt0_resources[] = {

	[0] = {

	[0] = {

		.name	= "CMT0",

		.start	= 0xfffec002,

		.start	= 0xfffec002,

		.end	= 0xfffec007,

		.end	= 0xfffec007,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -226,7 +224,6 @@ static struct platform_device cmt0_device = { 
};

};





static struct sh_timer_config cmt1_platform_data = {

static struct sh_timer_config cmt1_platform_data = {

	.name = "CMT1",

	.channel_offset = 0x08,

	.channel_offset = 0x08,

	.timer_bit = 1,

	.timer_bit = 1,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -236,7 +233,6 @@ static struct sh_timer_config cmt1_platform_data = { 




static struct resource cmt1_resources[] = {

static struct resource cmt1_resources[] = {

	[0] = {

	[0] = {

		.name	= "CMT1",

		.start	= 0xfffec008,

		.start	= 0xfffec008,

		.end	= 0xfffec00d,

		.end	= 0xfffec00d,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -258,7 +254,6 @@ static struct platform_device cmt1_device = { 
};

};





static struct sh_timer_config mtu2_0_platform_data = {

static struct sh_timer_config mtu2_0_platform_data = {

	.name = "MTU2_0",

	.channel_offset = -0x80,

	.channel_offset = -0x80,

	.timer_bit = 0,

	.timer_bit = 0,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -267,7 +262,6 @@ static struct sh_timer_config mtu2_0_platform_data = { 




static struct resource mtu2_0_resources[] = {

static struct resource mtu2_0_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_0",

		.start	= 0xfffe4300,

		.start	= 0xfffe4300,

		.end	= 0xfffe4326,

		.end	= 0xfffe4326,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -289,7 +283,6 @@ static struct platform_device mtu2_0_device = { 
};

};





static struct sh_timer_config mtu2_1_platform_data = {

static struct sh_timer_config mtu2_1_platform_data = {

	.name = "MTU2_1",

	.channel_offset = -0x100,

	.channel_offset = -0x100,

	.timer_bit = 1,

	.timer_bit = 1,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -298,7 +291,6 @@ static struct sh_timer_config mtu2_1_platform_data = { 




static struct resource mtu2_1_resources[] = {

static struct resource mtu2_1_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_1",

		.start	= 0xfffe4380,

		.start	= 0xfffe4380,

		.end	= 0xfffe4390,

		.end	= 0xfffe4390,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,
@@ -320,7 +312,6 @@ static struct platform_device mtu2_1_device = { 
};

};





static struct sh_timer_config mtu2_2_platform_data = {

static struct sh_timer_config mtu2_2_platform_data = {

	.name = "MTU2_2",

	.channel_offset = 0x80,

	.channel_offset = 0x80,

	.timer_bit = 2,

	.timer_bit = 2,

	.clk = "peripheral_clk",

	.clk = "peripheral_clk",
@@ -329,7 +320,6 @@ static struct sh_timer_config mtu2_2_platform_data = { 




static struct resource mtu2_2_resources[] = {

static struct resource mtu2_2_resources[] = {

	[0] = {

	[0] = {

		.name	= "MTU2_2",

		.start	= 0xfffe4000,

		.start	= 0xfffe4000,

		.end	= 0xfffe400a,

		.end	= 0xfffe400a,

		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,