mmc: core: Remove non-data R1B ioctl workaround

The workaround of pretending R1B non-data transfers are data transfers in
order for the busy timeout to be respected by the host controller driver is
removed. It wasn't useful in a long time.

Initially the workaround ensured that R1B commands did not time out by
setting the data timeout to be the command timeout in commit cb87ea28ed9e
("mmc: core: Add mmc CMD+ACMD passthrough ioctl"). This was moved inside an
if-clause with idata->buf_bytes being set in commit 4d6144de8ba2 ("mmc:
core: check for zero length ioctl data"). Since the workaround is now
inside the idata->buf_bytes clause and intended to fix R1B non-data
transfers, that do not have buf_bytes set, we can remove the workaround
altogether. This was dead code, since data transfers doesn't use R1B
commands.

Signed-off-by: Christian Loehle <cloehle@hyperstone.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/57d4aceb25254e448bd3e575bd99b0c2@hyperstone.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index db6d8a0999100bdf0a18e4a32abb5a92ffd45b87..20da7ed43e6d833f0bc77ca797139b017d487cdf 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -514,19 +514,6 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
                if (idata->ic.data_timeout_ns)
                        data.timeout_ns = idata->ic.data_timeout_ns;
 
-               if ((cmd.flags & MMC_RSP_R1B) == MMC_RSP_R1B) {
-                       /*
-                        * Pretend this is a data transfer and rely on the
-                        * host driver to compute timeout.  When all host
-                        * drivers support cmd.cmd_timeout for R1B, this
-                        * can be changed to:
-                        *
-                        *     mrq.data = NULL;
-                        *     cmd.cmd_timeout = idata->ic.cmd_timeout_ms;
-                        */
-                       data.timeout_ns = idata->ic.cmd_timeout_ms * 1000000;
-               }
-
                mrq.data = &data;
        }