mmc: dw_mmc: Remove caps2 and pm_caps from struct dw_mci_board

Nobody uses them.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 4d4a727b8b3f35cbdb6e41f025ed45be5fe8cfd2..d917b30598c525e2690da8712dd659952d90dc00 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2840,9 +2840,6 @@ static int dw_mci_init_host_caps(struct dw_mci *host)
        if (host->pdata->caps)
                mmc->caps = host->pdata->caps;
 
-       if (host->pdata->pm_caps)
-               mmc->pm_caps = host->pdata->pm_caps;
-
        if (drv_data)
                mmc->caps |= drv_data->common_caps;
 
@@ -2863,9 +2860,6 @@ static int dw_mci_init_host_caps(struct dw_mci *host)
                mmc->caps |= drv_data->caps[ctrl_id];
        }
 
-       if (host->pdata->caps2)
-               mmc->caps2 = host->pdata->caps2;
-
        /* if host has set a minimum_freq, we should respect it */
        if (host->minimum_speed)
                mmc->f_min = host->minimum_speed;

diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index 0ff301cda4dcd8a5116b803c2b599659e71270a2..47775dd8f6a35cd597a9ed1992e2375bd43555ea 100644 (file)
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -267,8 +267,6 @@ struct dw_mci_board {
        unsigned int bus_hz; /* Clock speed at the cclk_in pad */
 
        u32 caps;       /* Capabilities */
-       u32 caps2;      /* More capabilities */
-       u32 pm_caps;    /* PM capabilities */
        /*
         * Override fifo depth. If 0, autodetect it from the FIFOTH register,
         * but note that this may not be reliable after a bootloader has used