diff mbox

[06/18] mmc: meson-gx: simplify bounce buffer setting in meson_mmc_start_cmd

Message ID 10457b8c-401b-d473-0a24-30dfacb4eb48@gmail.com (mailing list archive)
State Superseded
Headers show

Commit Message

Heiner Kallweit Feb. 14, 2017, 8:06 p.m. UTC
If xfer_bytes is zero we can configure the chip to use the bounce
buffer as well because it won't get used anyway.
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>
---
 drivers/mmc/host/meson-gx-mmc.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Comments

Kevin Hilman Feb. 15, 2017, 5:14 p.m. UTC | #1
Heiner Kallweit <hkallweit1@gmail.com> writes:

> If xfer_bytes is zero we can configure the chip to use the bounce
> buffer as well because it won't get used anyway.
> 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>
> ---
>  drivers/mmc/host/meson-gx-mmc.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index c7bf0e12..423b4b17 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -505,15 +505,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
>  			cmd_cfg &= ~CMD_CFG_DATA_WR;
>  		}
>  
> -		if (xfer_bytes > 0) {
> -			cmd_cfg &= ~CMD_CFG_DATA_NUM;
> -			cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;
> -		} else {
> -			/* write data to data_addr */
> -			cmd_cfg |= CMD_CFG_DATA_NUM;
> -			cmd_data = 0;
> -		}
> -
> +		cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;

Could use a comment above this, mentioning (similar to the changelog)
that when CMD_CFG_DATA_NUM is set, this isn't used.

Otherwise:

Acked-by: Kevin Hilman <khilman@baylibre.com>
diff mbox

Patch

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index c7bf0e12..423b4b17 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -505,15 +505,7 @@  static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
 			cmd_cfg &= ~CMD_CFG_DATA_WR;
 		}
 
-		if (xfer_bytes > 0) {
-			cmd_cfg &= ~CMD_CFG_DATA_NUM;
-			cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;
-		} else {
-			/* write data to data_addr */
-			cmd_cfg |= CMD_CFG_DATA_NUM;
-			cmd_data = 0;
-		}
-
+		cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;
 		cmd_cfg_timeout = 12;
 	} else {
 		cmd_cfg &= ~CMD_CFG_DATA_IO;