mmc: meson-gx: remove unneeded configuration bit resets

The variables holding the configuration bits are zero-initialized.
So we can remove all bit resets.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index bd075fef08d4152553f76bfced8f392fba76734a..04a55577f1ab5a1eedfd6693583c3bba5119890f 100644 (file)
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -441,7 +441,6 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
 
        /* Response */
        if (cmd->flags & MMC_RSP_PRESENT) {
-               desc->cmd_cfg &= ~CMD_CFG_NO_RESP;
                if (cmd->flags & MMC_RSP_136)
                        desc->cmd_cfg |= CMD_CFG_RESP_128;
                desc->cmd_cfg |= CMD_CFG_RESP_NUM;
@@ -479,7 +478,6 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
                                writel(cfg, host->regs + SD_EMMC_CFG);
                        }
                } else {
-                       desc->cmd_cfg &= ~CMD_CFG_BLOCK_MODE;
                        desc->cmd_cfg |=
                                (cmd->data->blksz & CMD_CFG_LENGTH_MASK) <<
                                CMD_CFG_LENGTH_SHIFT;
@@ -494,15 +492,12 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
                                          host->bounce_buf, xfer_bytes);
                        cmd->data->bytes_xfered = xfer_bytes;
                        dma_wmb();
-               } else {
-                       desc->cmd_cfg &= ~CMD_CFG_DATA_WR;
                }
 
                desc->cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;
 
                cmd_cfg_timeout = ilog2(SD_EMMC_CMD_TIMEOUT_DATA);
        } else {
-               desc->cmd_cfg &= ~CMD_CFG_DATA_IO;
                cmd_cfg_timeout = ilog2(SD_EMMC_CMD_TIMEOUT);
        }
        desc->cmd_cfg |= (cmd_cfg_timeout & CMD_CFG_TIMEOUT_MASK) <<