mmc: dw_mmc: Let variant drivers to use struct dw_mci as possible

This patch changes the callbacks of switch_voltage() and execute_tuning()
in order for variant drivers to avoid accessing to struct dw_mci_slot.

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-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index 067569b1513830726ae2cc8be28c3391aa19e9be..41069850e6560af7705fd74607bf94d0907041e9 100644 (file)
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -530,9 +530,8 @@ out:
        return loc;
 }
 
-static int dw_mci_exynos_execute_tuning(struct dw_mci_slot *slot, u32 opcode)
+static int dw_mci_exynos_execute_tuning(struct dw_mci *host, u32 opcode)
 {
-       struct dw_mci *host = slot->host;
        struct dw_mci_exynos_priv_data *priv = host->priv;
        struct mmc_host *mmc = host->mmc;
        u8 start_smpl, smpl, candidates = 0;

diff --git a/drivers/mmc/host/dw_mmc-hi3798cv200.c b/drivers/mmc/host/dw_mmc-hi3798cv200.c
index 03f7ed86c872dcdbe5812b1cf372de24d70fbfec..4b723ed3259cafa43be07733c8af7d7b8728634b 100644 (file)
--- a/drivers/mmc/host/dw_mmc-hi3798cv200.c
+++ b/drivers/mmc/host/dw_mmc-hi3798cv200.c
@@ -57,11 +57,9 @@ static void dw_mci_hi3798cv200_set_ios(struct dw_mci *host, struct mmc_ios *ios)
                clk_set_phase(priv->drive_clk, 135);
 }
 
-static int dw_mci_hi3798cv200_execute_tuning(struct dw_mci_slot *slot,
-                                            u32 opcode)
+static int dw_mci_hi3798cv200_execute_tuning(struct dw_mci *host, u32 opcode)
 {
        static const int degrees[] = { 0, 45, 90, 135, 180, 225, 270, 315 };
-       struct dw_mci *host = slot->host;
        struct hi3798cv200_priv *priv = host->priv;
        int raise_point = -1, fall_point = -1;
        int err, prev_err = -1;

diff --git a/drivers/mmc/host/dw_mmc-hi3798mv200.c b/drivers/mmc/host/dw_mmc-hi3798mv200.c
index 3cc4bc28377bc6bed83932bbed0744c88e6a765d..a64907e2e84c501c72c0140030d6e3c1de12ceb7 100644 (file)
--- a/drivers/mmc/host/dw_mmc-hi3798mv200.c
+++ b/drivers/mmc/host/dw_mmc-hi3798mv200.c
@@ -74,25 +74,24 @@ static void dw_mci_hi3798mv200_set_ios(struct dw_mci *host, struct mmc_ios *ios)
        }
 }
 
-static inline int dw_mci_hi3798mv200_enable_tuning(struct dw_mci_slot *slot)
+static inline int dw_mci_hi3798mv200_enable_tuning(struct dw_mci *host)
 {
-       struct dw_mci_hi3798mv200_priv *priv = slot->host->priv;
+       struct dw_mci_hi3798mv200_priv *priv = host->priv;
 
        return regmap_clear_bits(priv->crg_reg, priv->sap_dll_offset, SAP_DLL_CTRL_DLLMODE);
 }
 
-static inline int dw_mci_hi3798mv200_disable_tuning(struct dw_mci_slot *slot)
+static inline int dw_mci_hi3798mv200_disable_tuning(struct dw_mci *host)
 {
-       struct dw_mci_hi3798mv200_priv *priv = slot->host->priv;
+       struct dw_mci_hi3798mv200_priv *priv = host->priv;
 
        return regmap_set_bits(priv->crg_reg, priv->sap_dll_offset, SAP_DLL_CTRL_DLLMODE);
 }
 
-static int dw_mci_hi3798mv200_execute_tuning_mix_mode(struct dw_mci_slot *slot,
+static int dw_mci_hi3798mv200_execute_tuning_mix_mode(struct dw_mci *host,
                                             u32 opcode)
 {
        static const int degrees[] = { 0, 45, 90, 135, 180, 225, 270, 315 };
-       struct dw_mci *host = slot->host;
        struct dw_mci_hi3798mv200_priv *priv = host->priv;
        int raise_point = -1, fall_point = -1, mid;
        int err, prev_err = -1;
@@ -101,7 +100,7 @@ static int dw_mci_hi3798mv200_execute_tuning_mix_mode(struct dw_mci_slot *slot,
        int i;
        int ret;
 
-       ret = dw_mci_hi3798mv200_enable_tuning(slot);
+       ret = dw_mci_hi3798mv200_enable_tuning(host);
        if (ret < 0)
                return ret;
 
@@ -136,7 +135,7 @@ static int dw_mci_hi3798mv200_execute_tuning_mix_mode(struct dw_mci_slot *slot,
        }
 
 tuning_out:
-       ret = dw_mci_hi3798mv200_disable_tuning(slot);
+       ret = dw_mci_hi3798mv200_disable_tuning(host);
        if (ret < 0)
                return ret;
 

diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c
index 4ef99c05305e5a43ba3717e3456b20d16d1e66ac..23c303106dcab93400b85a0da91f9a1967e60a22 100644 (file)
--- a/drivers/mmc/host/dw_mmc-k3.c
+++ b/drivers/mmc/host/dw_mmc-k3.c
@@ -138,15 +138,13 @@ static int dw_mci_hi6220_parse_dt(struct dw_mci *host)
        return 0;
 }
 
-static int dw_mci_hi6220_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
+static int dw_mci_hi6220_switch_voltage(struct dw_mci *host, struct mmc_ios *ios)
 {
-       struct dw_mci_slot *slot = mmc_priv(mmc);
        struct k3_priv *priv;
-       struct dw_mci *host;
+       struct mmc_host *mmc = host->mmc;
        int min_uv, max_uv;
        int ret;
 
-       host = slot->host;
        priv = host->priv;
 
        if (!priv || !priv->reg)
@@ -199,7 +197,7 @@ static void dw_mci_hi6220_set_ios(struct dw_mci *host, struct mmc_ios *ios)
        host->bus_hz = clk_get_rate(host->biu_clk);
 }
 
-static int dw_mci_hi6220_execute_tuning(struct dw_mci_slot *slot, u32 opcode)
+static int dw_mci_hi6220_execute_tuning(struct dw_mci *host, u32 opcode)
 {
        return 0;
 }
@@ -364,10 +362,9 @@ static int dw_mci_get_best_clksmpl(unsigned int sample_flag)
        return middle_range;
 }
 
-static int dw_mci_hi3660_execute_tuning(struct dw_mci_slot *slot, u32 opcode)
+static int dw_mci_hi3660_execute_tuning(struct dw_mci *host, u32 opcode)
 {
        int i = 0;
-       struct dw_mci *host = slot->host;
        struct mmc_host *mmc = host->mmc;
        int smpl_phase = 0;
        u32 tuning_sample_flag = 0;
@@ -398,15 +395,13 @@ static int dw_mci_hi3660_execute_tuning(struct dw_mci_slot *slot, u32 opcode)
        return 0;
 }
 
-static int dw_mci_hi3660_switch_voltage(struct mmc_host *mmc,
+static int dw_mci_hi3660_switch_voltage(struct dw_mci *host,
                                        struct mmc_ios *ios)
 {
-       int ret = 0;
-       struct dw_mci_slot *slot = mmc_priv(mmc);
        struct k3_priv *priv;
-       struct dw_mci *host;
+       struct mmc_host *mmc = host->mmc;
+       int ret = 0;
 
-       host = slot->host;
        priv = host->priv;
 
        if (!priv || !priv->reg)

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index c8816c5872cd286ff2b29b7d7f1b762485ae751a..922be2951da7eec5ee1b011c175988b2eabeb413 100644 (file)
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -284,9 +284,8 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios)
 #define TUNING_ITERATION_TO_PHASE(i, num_phases) \
                (DIV_ROUND_UP((i) * 360, num_phases))
 
-static int dw_mci_rk3288_execute_tuning(struct dw_mci_slot *slot, u32 opcode)
+static int dw_mci_rk3288_execute_tuning(struct dw_mci *host, u32 opcode)
 {
-       struct dw_mci *host = slot->host;
        struct dw_mci_rockchip_priv_data *priv = host->priv;
        struct mmc_host *mmc = host->mmc;
        int ret = 0;

diff --git a/drivers/mmc/host/dw_mmc-starfive.c b/drivers/mmc/host/dw_mmc-starfive.c
index d4ea289d0dcee725fa99d9adfa300259ddec432c..11472a641cbe9346572ad63d7406e22ce09bb456 100644 (file)
--- a/drivers/mmc/host/dw_mmc-starfive.c
+++ b/drivers/mmc/host/dw_mmc-starfive.c
@@ -53,11 +53,10 @@ static void dw_mci_starfive_set_sample_phase(struct dw_mci *host, u32 smpl_phase
        mdelay(1);
 }
 
-static int dw_mci_starfive_execute_tuning(struct dw_mci_slot *slot,
+static int dw_mci_starfive_execute_tuning(struct dw_mci *host,
                                             u32 opcode)
 {
        static const int grade  = MAX_DELAY_CHAIN;
-       struct dw_mci *host = slot->host;
        int smpl_phase, smpl_raise = -1, smpl_fall = -1;
        int ret;
 

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 5b3478a4d10e12a178057f450b8133c0a192108a..fec8ca8ae23c89cb7d2522c9d43ad99b55b2a0ae 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1483,7 +1483,7 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
        int ret;
 
        if (drv_data && drv_data->switch_voltage)
-               return drv_data->switch_voltage(mmc, ios);
+               return drv_data->switch_voltage(host, ios);
 
        /*
         * Program the voltage.  Note that some instances of dw_mmc may use
@@ -1641,7 +1641,7 @@ static int dw_mci_execute_tuning(struct mmc_host *mmc, u32 opcode)
        int err = -EINVAL;
 
        if (drv_data && drv_data->execute_tuning)
-               err = drv_data->execute_tuning(slot, opcode);
+               err = drv_data->execute_tuning(host, opcode);
        return err;
 }
 

diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index b4efc5812083e01914c706df54929feff8299c59..594c8f70aa253f18c71b1ca0ed1a24483f7302f5 100644 (file)
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -604,10 +604,10 @@ struct dw_mci_drv_data {
        int             (*init)(struct dw_mci *host);
        void            (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
        int             (*parse_dt)(struct dw_mci *host);
-       int             (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode);
+       int             (*execute_tuning)(struct dw_mci *host, u32 opcode);
        int             (*prepare_hs400_tuning)(struct dw_mci *host,
                                                struct mmc_ios *ios);
-       int             (*switch_voltage)(struct mmc_host *mmc,
+       int             (*switch_voltage)(struct dw_mci *host,
                                          struct mmc_ios *ios);
        void            (*set_data_timeout)(struct dw_mci *host,
                                          unsigned int timeout_ns);