mmc: sh_mmcif: Remove unused clk_ctrl2_present from the platform data

There are currently no users of the clk_ctrl2_present member from the
platform data, so let's remove it.

Note, as some of the sh_mmcif variants may support clk_ctrl2, let's keep
the current code in the driver, which deals with this. For future support,
we should invent a DT binding instead, but let's leave that until it's
needed.

Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 9fa8ce3fbb1b5e9884072159d246f7fc6e823eb9..4062d6bef3c81a3e8054e809b248f5829b7cfaa6 100644 (file)
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1428,7 +1428,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
        host->addr      = reg;
        host->timeout   = msecs_to_jiffies(10000);
        host->ccs_enable = true;
-       host->clk_ctrl2_enable = pd && pd->clk_ctrl2_present;
+       host->clk_ctrl2_enable = false;
 
        host->pd = pdev;
 

diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index 384b86b904737b1f4434bafd870127d136152689..a7baa29484c3e3350b29cc2f8ee63932d3d9b729 100644 (file)
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -34,7 +34,6 @@
 struct sh_mmcif_plat_data {
        unsigned int            slave_id_tx;    /* embedded slave_id_[tr]x */
        unsigned int            slave_id_rx;
-       bool                    clk_ctrl2_present : 1;
        u8                      sup_pclk;       /* 1 :SH7757, 0: SH7724/SH7372 */
        unsigned long           caps;
        u32                     ocr;