sh: get rid of div6 clock names

[deliverable/linux.git] / arch / sh / kernel / cpu / sh4a / clock-sh7724.c

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
index ad57c007b05c70d654bc4564b6c9807d24ae165b..2bbff53fcd871390747eb52d624d3908a2b11ff6 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
@@ -166,15 +166,12 @@ struct clk div4_clks[DIV4_NR] = {
 
 enum { DIV6_V, DIV6_FA, DIV6_FB, DIV6_I, DIV6_S, DIV6_NR };
 
-#define DIV6(_str, _reg, _flags) \
-  SH_CLK_DIV6(_str, &div3_clk, _reg, _flags)
-
 struct clk div6_clks[DIV6_NR] = {
-       [DIV6_V] = DIV6("video_clk", VCLKCR, 0),
-       [DIV6_FA] = DIV6("fsia_clk", FCLKACR, 0),
-       [DIV6_FB] = DIV6("fsib_clk", FCLKBCR, 0),
-       [DIV6_I] = DIV6("irda_clk", IRDACLKCR, 0),
-       [DIV6_S] = DIV6("spu_clk", SPUCLKCR, CLK_ENABLE_ON_INIT),
+       [DIV6_V] = SH_CLK_DIV6(&div3_clk, VCLKCR, 0),
+       [DIV6_FA] = SH_CLK_DIV6(&div3_clk, FCLKACR, 0),
+       [DIV6_FB] = SH_CLK_DIV6(&div3_clk, FCLKBCR, 0),
+       [DIV6_I] = SH_CLK_DIV6(&div3_clk, IRDACLKCR, 0),
+       [DIV6_S] = SH_CLK_DIV6(&div3_clk, SPUCLKCR, CLK_ENABLE_ON_INIT),
 };
 
 static struct clk mstp_clks[HWBLK_NR] = {