From: Matthias Kaehlcke <mka@chromium.org>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc@vger.kernel.org,
Adrian Hunter <adrian.hunter@intel.com>,
Douglas Anderson <dianders@chromium.org>,
Shawn Lin <shawn.lin@rock-chips.com>,
Jaehoon Chung <jh80.chung@samsung.com>,
Yong Mao <yong.mao@mediatek.com>,
Chaotian Jing <chaotian.jing@mediatek.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 11/11] mmc: sdhci: Convert to use sdio_irq_enabled()
Date: Thu, 5 Sep 2019 12:02:46 -0700 [thread overview]
Message-ID: <20190905190246.GC133864@google.com> (raw)
In-Reply-To: <20190903142207.5825-12-ulf.hansson@linaro.org>
On Tue, Sep 03, 2019 at 04:22:07PM +0200, Ulf Hansson wrote:
> Instead of keeping track of whether SDIO IRQs have been enabled via an
> internal sdhci status flag, avoid the open-coding and convert into using
> sdio_irq_enabled().
>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> ---
> drivers/mmc/host/sdhci.c | 7 +------
> drivers/mmc/host/sdhci.h | 1 -
> 2 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index a7df22ed65aa..4b4db41aec50 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -2142,11 +2142,6 @@ void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)
> pm_runtime_get_noresume(host->mmc->parent);
>
> spin_lock_irqsave(&host->lock, flags);
> - if (enable)
> - host->flags |= SDHCI_SDIO_IRQ_ENABLED;
> - else
> - host->flags &= ~SDHCI_SDIO_IRQ_ENABLED;
> -
> sdhci_enable_sdio_irq_nolock(host, enable);
> spin_unlock_irqrestore(&host->lock, flags);
>
> @@ -3380,7 +3375,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset)
> host->runtime_suspended = false;
>
> /* Enable SDIO IRQ */
> - if (host->flags & SDHCI_SDIO_IRQ_ENABLED)
> + if (sdio_irq_enabled(mmc))
> sdhci_enable_sdio_irq_nolock(host, true);
>
> /* Enable Card Detection */
> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
> index 8effaac61c3a..a29c4cd2d92e 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -512,7 +512,6 @@ struct sdhci_host {
> #define SDHCI_AUTO_CMD12 (1<<6) /* Auto CMD12 support */
> #define SDHCI_AUTO_CMD23 (1<<7) /* Auto CMD23 support */
> #define SDHCI_PV_ENABLED (1<<8) /* Preset value enabled */
> -#define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */
> #define SDHCI_USE_64_BIT_DMA (1<<12) /* Use 64-bit DMA */
> #define SDHCI_HS400_TUNING (1<<13) /* Tuning for HS400 */
> #define SDHCI_SIGNALING_330 (1<<14) /* Host is capable of 3.3V signaling */
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
prev parent reply other threads:[~2019-09-05 19:02 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-03 14:21 [PATCH 00/11] mmc: core: PM fixes/improvements for SDIO IRQs Ulf Hansson
2019-09-03 14:21 ` [PATCH 01/11] mmc: core: Add helper function to indicate if SDIO IRQs is enabled Ulf Hansson
2019-09-04 23:58 ` Matthias Kaehlcke
2019-09-05 7:28 ` Ulf Hansson
2019-09-03 14:21 ` [PATCH 02/11] mmc: dw_mmc: Re-store SDIO IRQs mask at system resume Ulf Hansson
2019-09-05 0:14 ` Matthias Kaehlcke
2019-09-05 7:29 ` Ulf Hansson
2019-09-05 17:01 ` Matthias Kaehlcke
2019-09-05 23:47 ` Doug Anderson
2019-09-06 9:19 ` Ulf Hansson
2019-09-06 21:37 ` Doug Anderson
2019-09-03 14:21 ` [PATCH 03/11] mmc: mtk-sd: " Ulf Hansson
2019-09-03 14:22 ` [PATCH 04/11] mmc: core: Move code to get pending SDIO IRQs to a function Ulf Hansson
2019-09-03 14:22 ` [PATCH 05/11] mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD Ulf Hansson
2019-09-05 0:34 ` Matthias Kaehlcke
2019-09-05 7:29 ` Ulf Hansson
2019-09-05 23:47 ` Doug Anderson
2019-09-06 9:19 ` Ulf Hansson
2019-09-06 21:30 ` Doug Anderson
2019-09-08 9:11 ` Ulf Hansson
2019-09-03 14:22 ` [PATCH 06/11] mmc: core: Clarify that the ->ack_sdio_irq() callback is mandatory Ulf Hansson
2019-09-05 17:33 ` Matthias Kaehlcke
2019-09-03 14:22 ` [PATCH 07/11] mmc: core: WARN if SDIO IRQs are enabled for non-powered card in suspend Ulf Hansson
2019-09-05 17:38 ` Matthias Kaehlcke
2019-09-03 14:22 ` [PATCH 08/11] mmc: core: Fixup processing of SDIO IRQs during system suspend/resume Ulf Hansson
2019-09-05 18:43 ` Matthias Kaehlcke
2019-09-06 9:42 ` Ulf Hansson
2019-09-05 23:48 ` Doug Anderson
2019-09-06 9:42 ` Ulf Hansson
2019-09-03 14:22 ` [PATCH 09/11] mmc: sdhci: Drop redundant check in sdhci_ack_sdio_irq() Ulf Hansson
2019-09-05 18:57 ` Matthias Kaehlcke
2019-09-03 14:22 ` [PATCH 10/11] mmc: sdhci: Drop redundant code for SDIO IRQs Ulf Hansson
2019-09-03 14:22 ` [PATCH 11/11] mmc: sdhci: Convert to use sdio_irq_enabled() Ulf Hansson
2019-09-05 19:02 ` Matthias Kaehlcke [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190905190246.GC133864@google.com \
--to=mka@chromium.org \
--cc=adrian.hunter@intel.com \
--cc=chaotian.jing@mediatek.com \
--cc=dianders@chromium.org \
--cc=jh80.chung@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=shawn.lin@rock-chips.com \
--cc=ulf.hansson@linaro.org \
--cc=yong.mao@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.