From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Sun, 8 Sep 2019 10:12:34 +0000 (+0200)
Subject: mmc: sdhci: Drop redundant check in sdhci_ack_sdio_irq()
X-Git-Tag: v5.4-rc1~147^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a84ad3242e53658c25bef0bc5b82e44e040390ba;p=thirdparty%2Fkernel%2Flinux.git

mmc: sdhci: Drop redundant check in sdhci_ack_sdio_irq()

The sdhci_ack_sdio_irq() is called only when SDIO IRQs are enabled.
Therefore, let's drop the redundant check of the internal
SDHCI_SDIO_IRQ_ENABLED flag and just re-enable the IRQs immediately.

Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index d814dc004badc..efa6cda8c9914 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2163,8 +2163,7 @@ static void sdhci_ack_sdio_irq(struct mmc_host *mmc)
 	unsigned long flags;
 
 	spin_lock_irqsave(&host->lock, flags);
-	if (host->flags & SDHCI_SDIO_IRQ_ENABLED)
-		sdhci_enable_sdio_irq_nolock(host, true);
+	sdhci_enable_sdio_irq_nolock(host, true);
 	spin_unlock_irqrestore(&host->lock, flags);
 }