[09/11] mmc: sdhci: Drop redundant check in sdhci_ack_sdio_irq()

Message ID 20190903142207.5825-10-ulf.hansson@linaro.org
State Superseded
Headers show
Series
  • mmc: core: PM fixes/improvements for SDIO IRQs
Related show

Commit Message

Ulf Hansson Sept. 3, 2019, 2:22 p.m.
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.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

---
 drivers/mmc/host/sdhci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.17.1

Comments

Matthias Kaehlcke Sept. 5, 2019, 6:57 p.m. | #1
On Tue, Sep 03, 2019 at 04:22:05PM +0200, Ulf Hansson wrote:
> 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.

> 

> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

> ---

>  drivers/mmc/host/sdhci.c | 3 +--

>  1 file changed, 1 insertion(+), 2 deletions(-)

> 

> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c

> index c1ebc26846db..2a9be044448a 100644

> --- a/drivers/mmc/host/sdhci.c

> +++ b/drivers/mmc/host/sdhci.c

> @@ -2161,8 +2161,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);

>  }



FWIW:

Reviewed-by:  Matthias Kaehlcke <mka@chromium.org>

Patch

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c1ebc26846db..2a9be044448a 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2161,8 +2161,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);
 }