| From 38db03ca6ac142eedb5eece18d8a0e0ae500064a Mon Sep 17 00:00:00 2001 |
| From: Ulf Hansson <ulf.hansson@linaro.org> |
| Date: Fri, 30 Dec 2016 13:47:18 +0100 |
| Subject: [PATCH 142/255] mmc: sh_mmcif: Remove unused ccs_unsupported from the |
| platform data |
| |
| There are currently no users of the ccs_unsupported member from the |
| platform data, so let's remove it. |
| |
| Note, as some of the sh_mmcif variants may not support ccs, 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> |
| (cherry picked from commit 8020f71117042ed82287e4f51c48b57ce4c783df) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mmcif.c | 2 +- |
| include/linux/mmc/sh_mmcif.h | 1 - |
| 2 files changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/mmc/host/sh_mmcif.c |
| +++ b/drivers/mmc/host/sh_mmcif.c |
| @@ -1427,7 +1427,7 @@ static int sh_mmcif_probe(struct platfor |
| host->mmc = mmc; |
| host->addr = reg; |
| host->timeout = msecs_to_jiffies(10000); |
| - host->ccs_enable = !pd || !pd->ccs_unsupported; |
| + host->ccs_enable = true; |
| host->clk_ctrl2_enable = pd && pd->clk_ctrl2_present; |
| |
| host->pd = pdev; |
| --- 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 ccs_unsupported : 1; |
| bool clk_ctrl2_present : 1; |
| u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */ |
| unsigned long caps; |
