mmc: Drop unused mmc_send_tuning() cmd_error parameter

The cmd_error parameter is not used, remove it.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 05595bdac393bb002a252ff2e7645ec7613776ac..2139fea04d599427cb5ba7e5212a87c5a39fc54b 100644 (file)
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -390,7 +390,7 @@ static int am654_sdhci_execute_tuning(struct mmc *mmc, u8 opcode)
        for (itap = 0; itap < ITAP_MAX; itap++) {
                am654_sdhci_write_itapdly(plat, itap);
 
-               cur_val = !mmc_send_tuning(mmc, opcode, NULL);
+               cur_val = !mmc_send_tuning(mmc, opcode);
                if (cur_val && !prev_val)
                        pass_window = itap;
 

diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index d5066666698c484497654caaf13a594ff94e3620..d44dfa5d06f678e6f76e6d680499a49a93a0d3d9 100644 (file)
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -1123,7 +1123,7 @@ static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode)
        esdhc_write32(&regs->irqstaten, IRQSTATEN_BRR);
 
        for (i = 0; i < MAX_TUNING_LOOP; i++) {
-               mmc_send_tuning(mmc, opcode, NULL);
+               mmc_send_tuning(mmc, opcode);
                mdelay(1);
 
                val = esdhc_read32(&regs->autoc12err);

diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 7c39c86c5e9c5d6bf6b1644190be3a40669e8eb2..b74c014002058f84d10823f87ae1049c96ecc06e 100644 (file)
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -882,7 +882,7 @@ static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode)
                esdhc_write32(&regs->mixctrl, val);
 
                /* We are using STD tuning, no need to check return value */
-               mmc_send_tuning(mmc, opcode, NULL);
+               mmc_send_tuning(mmc, opcode);
 
                ctrl = esdhc_read32(&regs->autoc12err);
                if ((!(ctrl & MIX_CTRL_EXE_TUNE)) &&

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 00f4964aae3b9a3ac3627e5e57e1d482cc98f126..156e2a0242cdb484c5c133b5669d251867afb697 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -360,7 +360,7 @@ static const u8 tuning_blk_pattern_8bit[] = {
        0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee,
 };
 
-int mmc_send_tuning(struct mmc *mmc, u32 opcode, int *cmd_error)
+int mmc_send_tuning(struct mmc *mmc, u32 opcode)
 {
        struct mmc_cmd cmd;
        struct mmc_data data;

diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index 5a0c61daed5d81b1ba745b2107b96b956d0f4ad5..296aaee73318c4ef19cd42b88aaeb491aba64479 100644 (file)
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -1131,7 +1131,7 @@ static int hs400_tune_response(struct udevice *dev, u32 opcode)
                                i << PAD_CMD_TUNE_RX_DLY3_S);
 
                for (j = 0; j < 3; j++) {
-                       mmc_send_tuning(mmc, opcode, &cmd_err);
+                       cmd_err = mmc_send_tuning(mmc, opcode);
                        if (!cmd_err) {
                                cmd_delay |= (1 << i);
                        } else {
@@ -1181,7 +1181,7 @@ static int msdc_tune_response(struct udevice *dev, u32 opcode)
                                i << MSDC_PAD_TUNE_CMDRDLY_S);
 
                for (j = 0; j < 3; j++) {
-                       mmc_send_tuning(mmc, opcode, &cmd_err);
+                       cmd_err = mmc_send_tuning(mmc, opcode);
                        if (!cmd_err) {
                                rise_delay |= (1 << i);
                        } else {
@@ -1203,7 +1203,7 @@ static int msdc_tune_response(struct udevice *dev, u32 opcode)
                                i << MSDC_PAD_TUNE_CMDRDLY_S);
 
                for (j = 0; j < 3; j++) {
-                       mmc_send_tuning(mmc, opcode, &cmd_err);
+                       cmd_err = mmc_send_tuning(mmc, opcode);
                        if (!cmd_err) {
                                fall_delay |= (1 << i);
                        } else {
@@ -1238,7 +1238,7 @@ skip_fall:
                clrsetbits_le32(tune_reg, MSDC_PAD_TUNE_CMDRRDLY_M,
                                i << MSDC_PAD_TUNE_CMDRRDLY_S);
 
-               mmc_send_tuning(mmc, opcode, &cmd_err);
+               cmd_err = mmc_send_tuning(mmc, opcode);
                if (!cmd_err)
                        internal_delay |= (1 << i);
        }
@@ -1264,7 +1264,6 @@ static int msdc_tune_data(struct udevice *dev, u32 opcode)
        struct msdc_delay_phase final_rise_delay, final_fall_delay = { 0, };
        u8 final_delay, final_maxlen;
        void __iomem *tune_reg = &host->base->pad_tune;
-       int cmd_err;
        int i, ret;
 
        if (host->dev_comp->pad_tune0)
@@ -1277,10 +1276,10 @@ static int msdc_tune_data(struct udevice *dev, u32 opcode)
                clrsetbits_le32(tune_reg, MSDC_PAD_TUNE_DATRRDLY_M,
                                i << MSDC_PAD_TUNE_DATRRDLY_S);
 
-               ret = mmc_send_tuning(mmc, opcode, &cmd_err);
+               ret = mmc_send_tuning(mmc, opcode);
                if (!ret) {
                        rise_delay |= (1 << i);
-               } else if (cmd_err) {
+               } else {
                        /* in this case, retune response is needed */
                        ret = msdc_tune_response(dev, opcode);
                        if (ret)
@@ -1300,10 +1299,10 @@ static int msdc_tune_data(struct udevice *dev, u32 opcode)
                clrsetbits_le32(tune_reg, MSDC_PAD_TUNE_DATRRDLY_M,
                                i << MSDC_PAD_TUNE_DATRRDLY_S);
 
-               ret = mmc_send_tuning(mmc, opcode, &cmd_err);
+               ret = mmc_send_tuning(mmc, opcode);
                if (!ret) {
                        fall_delay |= (1 << i);
-               } else if (cmd_err) {
+               } else {
                        /* in this case, retune response is needed */
                        ret = msdc_tune_response(dev, opcode);
                        if (ret)
@@ -1362,7 +1361,7 @@ static int msdc_tune_together(struct udevice *dev, u32 opcode)
        for (i = 0; i < PAD_DELAY_MAX; i++) {
                msdc_set_cmd_delay(host, i);
                msdc_set_data_delay(host, i);
-               ret = mmc_send_tuning(mmc, opcode, NULL);
+               ret = mmc_send_tuning(mmc, opcode);
                if (!ret)
                        rise_delay |= (1 << i);
        }
@@ -1378,7 +1377,7 @@ static int msdc_tune_together(struct udevice *dev, u32 opcode)
        for (i = 0; i < PAD_DELAY_MAX; i++) {
                msdc_set_cmd_delay(host, i);
                msdc_set_data_delay(host, i);
-               ret = mmc_send_tuning(mmc, opcode, NULL);
+               ret = mmc_send_tuning(mmc, opcode);
                if (!ret)
                        fall_delay |= (1 << i);
        }

diff --git a/drivers/mmc/octeontx_hsmmc.c b/drivers/mmc/octeontx_hsmmc.c
index 4ee62df9d408eaae535b5b85530829d167fb9f41..7f9c4f4d36d4aa727baf7fc986e682801eb59f7f 100644 (file)
--- a/drivers/mmc/octeontx_hsmmc.c
+++ b/drivers/mmc/octeontx_hsmmc.c
@@ -1653,6 +1653,12 @@ static int octeontx_mmc_test_cmd(struct mmc *mmc, u32 opcode, int *statp)
        return err;
 }
 
+static int octeontx_mmc_send_tuning(struct mmc *mmc, u32 opcode, int *error)
+{
+       *error = 0;
+       return mmc_send_tuning(mmc, opcode);
+}
+
 static int octeontx_mmc_test_get_ext_csd(struct mmc *mmc, u32 opcode,
                                         int *statp)
 {
@@ -2006,7 +2012,7 @@ struct adj adj[] = {
        { "CMD_IN", 48, octeontx_mmc_test_cmd, MMC_CMD_SEND_STATUS,
          false, false, false, 2, },
 /*     { "CMD_OUT", 32, octeontx_mmc_test_cmd, MMC_CMD_SEND_STATUS, },*/
-       { "DATA_IN(HS200)", 16, mmc_send_tuning,
+       { "DATA_IN(HS200)", 16, octeontx_mmc_send_tuning,
                MMC_CMD_SEND_TUNING_BLOCK_HS200, false, true, false, 2, },
        { "DATA_IN", 16, octeontx_mmc_test_get_ext_csd, 0, false, false,
          true, 2, },

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index a2595d19e7f62ca6d6f4e57415282371fe16fea2..99f21b2c546ae4d827c5d49247537056e5a39cb9 100644 (file)
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -666,7 +666,7 @@ static int omap_hsmmc_execute_tuning(struct udevice *dev, uint opcode)
        while (phase_delay <= MAX_PHASE_DELAY) {
                omap_hsmmc_set_dll(mmc, phase_delay);
 
-               cur_match = !mmc_send_tuning(mmc, opcode, NULL);
+               cur_match = !mmc_send_tuning(mmc, opcode);
 
                if (cur_match) {
                        if (prev_match) {
@@ -731,7 +731,7 @@ static int omap_hsmmc_execute_tuning(struct udevice *dev, uint opcode)
         */
        for (i = 3; i <= 10; i++) {
                omap_hsmmc_set_dll(mmc, phase_delay + i);
-               if (mmc_send_tuning(mmc, opcode, NULL)) {
+               if (mmc_send_tuning(mmc, opcode)) {
                        if (temperature < 10000)
                                phase_delay += i + 6;
                        else if (temperature < 20000)
@@ -749,7 +749,7 @@ static int omap_hsmmc_execute_tuning(struct udevice *dev, uint opcode)
 
        for (i = 2; i >= -10; i--) {
                omap_hsmmc_set_dll(mmc, phase_delay + i);
-               if (mmc_send_tuning(mmc, opcode, NULL)) {
+               if (mmc_send_tuning(mmc, opcode)) {
                        if (temperature < 10000)
                                phase_delay += i + 12;
                        else if (temperature < 20000)

diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 20b1e9277eb013234fe544bfc717d96e1c9a8427..4ee8657f79505be001f0665b7db006e9ff3f686f 100644 (file)
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -605,7 +605,7 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode)
                caps = priv->caps;
                priv->caps &= ~TMIO_SD_CAP_DMA_INTERNAL;
 
-               ret = mmc_send_tuning(mmc, opcode, NULL);
+               ret = mmc_send_tuning(mmc, opcode);
 
                priv->caps = caps;
 

diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index 327a05ad11d00fad415bd18b93d83f08e2b6ed5a..c0a9f60b1496fe6a9af6502c087920cc839d444c 100644 (file)
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -224,7 +224,7 @@ static int __maybe_unused sdhci_cdns_execute_tuning(struct udevice *dev,
 
        for (i = 0; i < SDHCI_CDNS_MAX_TUNING_LOOP; i++) {
                if (sdhci_cdns_set_tune_val(plat, i) ||
-                   mmc_send_tuning(mmc, opcode, NULL)) { /* bad */
+                   mmc_send_tuning(mmc, opcode)) { /* bad */
                        cur_streak = 0;
                } else { /* good */
                        cur_streak++;

diff --git a/include/mmc.h b/include/mmc.h
index 9aef31ea5deb5a93418e4166c1e024af4378864a..8df14130eddf996fefcdf5c8ef2efaa061e5f621 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -795,7 +795,7 @@ int mmc_unbind(struct udevice *dev);
 int mmc_initialize(struct bd_info *bis);
 int mmc_init_device(int num);
 int mmc_init(struct mmc *mmc);
-int mmc_send_tuning(struct mmc *mmc, u32 opcode, int *cmd_error);
+int mmc_send_tuning(struct mmc *mmc, u32 opcode);
 int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data);
 int mmc_deinit(struct mmc *mmc);