mmc: au1xmmc: Drop redundant code in au1xmmc_send_command() (4c3965aa) · Commits · 戴 / test

drivers/mmc/host/au1xmmc.c

+2 −18

Original line number	Diff line number	Diff line
		@@ -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);
		@@ -302,9 +302,6 @@ 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 */

		@@ -312,19 +309,6 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
		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;
		}

		@@ -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;