Skip to content

Commit

Permalink
mmc: au1xmmc: Drop redundant code in au1xmmc_send_command()
Browse files Browse the repository at this point in the history
The in-parameter "wait" is always set to 0 by the caller, hence just drop
it and its corresponding code.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Manuel Lauss <manuel.lauss@gmail.com>
Link: https://lore.kernel.org/r/20200406114337.8802-1-ulf.hansson@linaro.org
  • Loading branch information
Ulf Hansson committed May 28, 2020
1 parent a049b5a commit 4c3965a
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions drivers/mmc/host/au1xmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ static void au1xmmc_tasklet_finish(unsigned long param)
au1xmmc_finish_request(host);
}

static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
static int au1xmmc_send_command(struct au1xmmc_host *host,
struct mmc_command *cmd, struct mmc_data *data)
{
u32 mmccmd = (cmd->opcode << SD_CMD_CI_SHIFT);
Expand Down Expand Up @@ -302,29 +302,13 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
__raw_writel(cmd->arg, HOST_CMDARG(host));
wmb(); /* drain writebuffer */

if (wait)
IRQ_OFF(host, SD_CONFIG_CR);

__raw_writel((mmccmd | SD_CMD_GO), HOST_CMD(host));
wmb(); /* drain writebuffer */

/* Wait for the command to go on the line */
while (__raw_readl(HOST_CMD(host)) & SD_CMD_GO)
/* nop */;

/* Wait for the command to come back */
if (wait) {
u32 status = __raw_readl(HOST_STATUS(host));

while (!(status & SD_STATUS_CR))
status = __raw_readl(HOST_STATUS(host));

/* Clear the CR status */
__raw_writel(SD_STATUS_CR, HOST_STATUS(host));

IRQ_ON(host, SD_CONFIG_CR);
}

return 0;
}

Expand Down Expand Up @@ -711,7 +695,7 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
}

if (!ret)
ret = au1xmmc_send_command(host, 0, mrq->cmd, mrq->data);
ret = au1xmmc_send_command(host, mrq->cmd, mrq->data);

if (ret) {
mrq->cmd->error = ret;
Expand Down

0 comments on commit 4c3965a

Please sign in to comment.