diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2016-12-30 15:47:19 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2017-02-13 15:19:58 +0300 |
| commit | dba4bb484e9e495478f2bcf474393d33f7e0ec27 (patch) | |
| tree | f404e6f7766207be9de0a838646ae66f09be3274 | |
| parent | 8020f71117042ed82287e4f51c48b57ce4c783df (diff) | |
| download | linux-dba4bb484e9e495478f2bcf474393d33f7e0ec27.tar.xz | |
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>
| -rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 2 | ||||
| -rw-r--r-- | include/linux/mmc/sh_mmcif.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 9fa8ce3fbb1b..4062d6bef3c8 100644 --- 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 384b86b90473..a7baa29484c3 100644 --- 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; |