Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cb9da50 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: mmci: Remove redundant check of status for DATA irq 



We don't need to verify the content of the status register twice, while
we are about to handle a DATA irq. Instead let's leave all verification
to be handled by mmci_data_irq().

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Tested-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: <stable@vger.kernel.org> # v3.15+
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 3a33a94c

drivers/mmc/host/mmci.c

+5 −6
Original line number Diff line number Diff line
@@ -888,6 +888,10 @@ static void 
mmci_data_irq(struct mmci_host *host, struct mmc_data *data,

	      unsigned int status)

{

	/* Make sure we have data to handle */

	if (!data)

		return;



	/* First check for errors */

	if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|

		      MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
@@ -1206,7 +1210,6 @@ static irqreturn_t mmci_irq(int irq, void *dev_id) 


	do {

		struct mmc_command *cmd;

		struct mmc_data *data;



		status = readl(host->base + MMCISTATUS);
@@ -1232,11 +1235,7 @@ static irqreturn_t mmci_irq(int irq, void *dev_id) 
			MCI_CMDSENT|MCI_CMDRESPEND) && cmd)

			mmci_cmd_irq(host, cmd, status);



		data = host->data;

		if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|

			      MCI_TXUNDERRUN|MCI_RXOVERRUN|MCI_DATAEND|

			      MCI_DATABLOCKEND) && data)

			mmci_data_irq(host, data, status);

		mmci_data_irq(host, host->data, status);



		/* Don't poll for busy completion in irq context. */

		if (host->busy_status)