]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mmc: meson-gx: simplify bounce buffer setting in meson_mmc_start_cmd
authorHeiner Kallweit <hkallweit1@gmail.com>
Sat, 4 Mar 2017 12:19:23 +0000 (13:19 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 24 Apr 2017 19:41:07 +0000 (21:41 +0200)
Core ensures that there are no commands with cmd->data being set and
nothing to transfer. And we don't have to reset bit CMD_CFG_DATA_NUM
because cmd_cfg was zero-initialized and this bit isn't set.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Tested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/meson-gx-mmc.c

index 5a959783304bc6fd97cd8edf9cdca6614413cc18..07a7399cf69ebdff28be686e3d052509851796f6 100644 (file)
@@ -516,14 +516,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
                        desc->cmd_cfg &= ~CMD_CFG_DATA_WR;
                }
 
-               if (xfer_bytes > 0) {
-                       desc->cmd_cfg &= ~CMD_CFG_DATA_NUM;
-                       desc->cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;
-               } else {
-                       /* write data to data_addr */
-                       desc->cmd_cfg |= CMD_CFG_DATA_NUM;
-                       desc->cmd_data = 0;
-               }
+               desc->cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;
 
                cmd_cfg_timeout = 12;
        } else {