sh: get rid of mstp32 clock name and id

Remove the name and the id from SH_CLK_MSTP32().
Now when lookups are handled by clkdev they are
not needed anymore.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 46 insertions, 47 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
index f661d4633573..0aabb5d31356 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
@@ -142,8 +142,8 @@ struct clk div6_clks[DIV6_NR] = {
         [DIV6_V] = SH_CLK_DIV6(&pll_clk, VCLKCR, 0),
 };
 
-#define MSTP(_str, _parent, _reg, _bit, _flags) \
-  SH_CLK_MSTP32(_str, -1, _parent, _reg, _bit, _flags)
+#define MSTP(_parent, _reg, _bit, _flags) \
+  SH_CLK_MSTP32(_parent, _reg, _bit, _flags)
 
 enum { MSTP031, MSTP030, MSTP029, MSTP028, MSTP026,
        MSTP023, MSTP022, MSTP021, MSTP020, MSTP019, MSTP018, MSTP017, MSTP016,
@@ -156,50 +156,50 @@ enum { MSTP031, MSTP030, MSTP029, MSTP028, MSTP026,
        MSTP_NR };
 
 static struct clk mstp_clks[MSTP_NR] = {
-        [MSTP031] = MSTP("tlb0", &div4_clks[DIV4_I], MSTPCR0, 31, CLK_ENABLE_ON_INIT),
-        [MSTP030] = MSTP("ic0", &div4_clks[DIV4_I], MSTPCR0, 30, CLK_ENABLE_ON_INIT),
-        [MSTP029] = MSTP("oc0", &div4_clks[DIV4_I], MSTPCR0, 29, CLK_ENABLE_ON_INIT),
-        [MSTP028] = MSTP("uram0", &div4_clks[DIV4_U], MSTPCR0, 28, CLK_ENABLE_ON_INIT),
-        [MSTP026] = MSTP("xymem0", &div4_clks[DIV4_B], MSTPCR0, 26, CLK_ENABLE_ON_INIT),
-        [MSTP023] = MSTP("intc3", &div4_clks[DIV4_P], MSTPCR0, 23, 0),
-        [MSTP022] = MSTP("intc0", &div4_clks[DIV4_P], MSTPCR0, 22, 0),
-        [MSTP021] = MSTP("dmac0", &div4_clks[DIV4_P], MSTPCR0, 21, 0),
-        [MSTP020] = MSTP("sh0", &div4_clks[DIV4_P], MSTPCR0, 20, 0),
-        [MSTP019] = MSTP("hudi0", &div4_clks[DIV4_P], MSTPCR0, 19, 0),
-        [MSTP017] = MSTP("ubc0", &div4_clks[DIV4_P], MSTPCR0, 17, 0),
-        [MSTP015] = MSTP("tmu_fck", &div4_clks[DIV4_P], MSTPCR0, 15, 0),
-        [MSTP014] = MSTP("cmt_fck", &r_clk, MSTPCR0, 14, 0),
-        [MSTP013] = MSTP("rwdt0", &r_clk, MSTPCR0, 13, 0),
-        [MSTP011] = MSTP("mfi0", &div4_clks[DIV4_P], MSTPCR0, 11, 0),
-        [MSTP010] = MSTP("flctl0", &div4_clks[DIV4_P], MSTPCR0, 10, 0),
-        [MSTP007] = SH_CLK_MSTP32("sci_fck", 0, &div4_clks[DIV4_P], MSTPCR0, 7, 0),
-        [MSTP006] = SH_CLK_MSTP32("sci_fck", 1, &div4_clks[DIV4_P], MSTPCR0, 6, 0),
-        [MSTP005] = SH_CLK_MSTP32("sci_fck", 2, &div4_clks[DIV4_P], MSTPCR0, 5, 0),
-        [MSTP004] = SH_CLK_MSTP32("sci_fck", 3, &div4_clks[DIV4_P], MSTPCR0, 4, 0),
-        [MSTP003] = MSTP("sio0", &div4_clks[DIV4_P], MSTPCR0, 3, 0),
-        [MSTP002] = MSTP("siof0", &div4_clks[DIV4_P], MSTPCR0, 2, 0),
-        [MSTP001] = MSTP("siof1", &div4_clks[DIV4_P], MSTPCR0, 1, 0),
-
-        [MSTP109] = MSTP("i2c0", &div4_clks[DIV4_P], MSTPCR1, 9, 0),
-        [MSTP108] = MSTP("i2c1", &div4_clks[DIV4_P], MSTPCR1, 8, 0),
-
-        [MSTP225] = MSTP("tpu0", &div4_clks[DIV4_P], MSTPCR2, 25, 0),
-        [MSTP224] = MSTP("irda0", &div4_clks[DIV4_P], MSTPCR2, 24, 0),
-        [MSTP218] = MSTP("sdhi0", &div4_clks[DIV4_P], MSTPCR2, 18, 0),
-        [MSTP217] = MSTP("mmcif0", &div4_clks[DIV4_P], MSTPCR2, 17, 0),
-        [MSTP216] = MSTP("sim0", &div4_clks[DIV4_P], MSTPCR2, 16, 0),
-        [MSTP214] = MSTP("keysc0", &r_clk, MSTPCR2, 14, 0),
-        [MSTP213] = MSTP("tsif0", &div4_clks[DIV4_P], MSTPCR2, 13, 0),
-        [MSTP212] = MSTP("s3d40", &div4_clks[DIV4_P], MSTPCR2, 12, 0),
-        [MSTP211] = MSTP("usbf0", &div4_clks[DIV4_P], MSTPCR2, 11, 0),
-        [MSTP208] = MSTP("siu0", &div4_clks[DIV4_B], MSTPCR2, 8, 0),
-        [MSTP206] = MSTP("jpu0", &div4_clks[DIV4_B], MSTPCR2, 6, CLK_ENABLE_ON_INIT),
-        [MSTP205] = MSTP("vou0", &div4_clks[DIV4_B], MSTPCR2, 5, 0),
-        [MSTP204] = MSTP("beu0", &div4_clks[DIV4_B], MSTPCR2, 4, 0),
-        [MSTP203] = MSTP("ceu0", &div4_clks[DIV4_B], MSTPCR2, 3, 0),
-        [MSTP202] = MSTP("veu0", &div4_clks[DIV4_B], MSTPCR2, 2, CLK_ENABLE_ON_INIT),
-        [MSTP201] = MSTP("vpu0", &div4_clks[DIV4_B], MSTPCR2, 1, CLK_ENABLE_ON_INIT),
-        [MSTP200] = MSTP("lcdc0", &div4_clks[DIV4_B], MSTPCR2, 0, 0),
+        [MSTP031] = MSTP(&div4_clks[DIV4_I], MSTPCR0, 31, CLK_ENABLE_ON_INIT),
+        [MSTP030] = MSTP(&div4_clks[DIV4_I], MSTPCR0, 30, CLK_ENABLE_ON_INIT),
+        [MSTP029] = MSTP(&div4_clks[DIV4_I], MSTPCR0, 29, CLK_ENABLE_ON_INIT),
+        [MSTP028] = MSTP(&div4_clks[DIV4_U], MSTPCR0, 28, CLK_ENABLE_ON_INIT),
+        [MSTP026] = MSTP(&div4_clks[DIV4_B], MSTPCR0, 26, CLK_ENABLE_ON_INIT),
+        [MSTP023] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 23, 0),
+        [MSTP022] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 22, 0),
+        [MSTP021] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 21, 0),
+        [MSTP020] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 20, 0),
+        [MSTP019] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 19, 0),
+        [MSTP017] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 17, 0),
+        [MSTP015] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 15, 0),
+        [MSTP014] = MSTP(&r_clk, MSTPCR0, 14, 0),
+        [MSTP013] = MSTP(&r_clk, MSTPCR0, 13, 0),
+        [MSTP011] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 11, 0),
+        [MSTP010] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 10, 0),
+        [MSTP007] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 7, 0),
+        [MSTP006] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 6, 0),
+        [MSTP005] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 5, 0),
+        [MSTP004] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 4, 0),
+        [MSTP003] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 3, 0),
+        [MSTP002] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 2, 0),
+        [MSTP001] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 1, 0),
+
+        [MSTP109] = MSTP(&div4_clks[DIV4_P], MSTPCR1, 9, 0),
+        [MSTP108] = MSTP(&div4_clks[DIV4_P], MSTPCR1, 8, 0),
+
+        [MSTP225] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 25, 0),
+        [MSTP224] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 24, 0),
+        [MSTP218] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 18, 0),
+        [MSTP217] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 17, 0),
+        [MSTP216] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 16, 0),
+        [MSTP214] = MSTP(&r_clk, MSTPCR2, 14, 0),
+        [MSTP213] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 13, 0),
+        [MSTP212] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 12, 0),
+        [MSTP211] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 11, 0),
+        [MSTP208] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 8, 0),
+        [MSTP206] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 6, CLK_ENABLE_ON_INIT),
+        [MSTP205] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 5, 0),
+        [MSTP204] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 4, 0),
+        [MSTP203] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 3, 0),
+        [MSTP202] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 2, CLK_ENABLE_ON_INIT),
+        [MSTP201] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 1, CLK_ENABLE_ON_INIT),
+        [MSTP200] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 0, 0),
 };
 
 #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
@@ -216,7 +216,6 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("xymem0", &mstp_clks[MSTP026]),
         CLKDEV_CON_ID("intc3", &mstp_clks[MSTP023]),
         CLKDEV_CON_ID("intc0", &mstp_clks[MSTP022]),
-
         CLKDEV_CON_ID("dmac0", &mstp_clks[MSTP021]),
         CLKDEV_CON_ID("sh0", &mstp_clks[MSTP020]),
         CLKDEV_CON_ID("hudi0", &mstp_clks[MSTP019]),