Re: [PATCH] mmc: cqhci: Remove unused intmask parameter from cqhci_irq()
Ulf Hansson <[email protected]> Mon, 6 Jul 2026 17:46:16 +0200
| Newsgroups | org.kernel.vger.linux-mmc,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-kernel,org.kernel.vger.linux-tegra |
|---|---|
| Message-ID | <CAPx+jO9=7B4SYyKSwvGqx+zzMsJ+hhFUK_vmU-HNYQZfKv+bdQ@mail.gmail.com> |
On Wed, Jun 24, 2026 at 4:20 AM Chanwoo Lee <[email protected]> wrote: > > The intmask parameter of cqhci_irq() is never used within the function > body. The function reads the CQHCI interrupt status directly via > cqhci_readl() and processes interrupts independently of the SDHCI > intmask value passed by callers. > > Signed-off-by: Chanwoo Lee <[email protected]> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/cqhci-core.c | 3 +-- > drivers/mmc/host/cqhci.h | 3 +-- > drivers/mmc/host/mtk-sd.c | 2 +- > drivers/mmc/host/sdhci-brcmstb.c | 2 +- > drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- > drivers/mmc/host/sdhci-msm.c | 2 +- > drivers/mmc/host/sdhci-of-arasan.c | 2 +- > drivers/mmc/host/sdhci-of-dwcmshc.c | 2 +- > drivers/mmc/host/sdhci-pci-core.c | 2 +- > drivers/mmc/host/sdhci-pci-gli.c | 2 +- > drivers/mmc/host/sdhci-tegra.c | 2 +- > drivers/mmc/host/sdhci_am654.c | 2 +- > 12 files changed, 12 insertions(+), 14 deletions(-) > > diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c > index 178277d90c31..98ceb0b9a6d1 100644 > --- a/drivers/mmc/host/cqhci-core.c > +++ b/drivers/mmc/host/cqhci-core.c > @@ -819,8 +819,7 @@ static void cqhci_finish_mrq(struct mmc_host *mmc, unsigned int tag) > mmc_cqe_request_done(mmc, mrq); > } > > -irqreturn_t cqhci_irq(struct mmc_host *mmc, u32 intmask, int cmd_error, > - int data_error) > +irqreturn_t cqhci_irq(struct mmc_host *mmc, int cmd_error, int data_error) > { > u32 status; > unsigned long tag = 0, comp_status; > diff --git a/drivers/mmc/host/cqhci.h b/drivers/mmc/host/cqhci.h > index 3668856531c1..8fbbc48c3f85 100644 > --- a/drivers/mmc/host/cqhci.h > +++ b/drivers/mmc/host/cqhci.h > @@ -315,8 +315,7 @@ static inline u32 cqhci_readl(struct cqhci_host *host, int reg) > > struct platform_device; > > -irqreturn_t cqhci_irq(struct mmc_host *mmc, u32 intmask, int cmd_error, > - int data_error); > +irqreturn_t cqhci_irq(struct mmc_host *mmc, int cmd_error, int data_error); > int cqhci_init(struct cqhci_host *cq_host, struct mmc_host *mmc, bool dma64); > struct cqhci_host *cqhci_pltfm_init(struct platform_device *pdev); > int cqhci_deactivate(struct mmc_host *mmc); > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index b2680cc054bd..01ea3adbdf3b 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -1805,7 +1805,7 @@ static irqreturn_t msdc_cmdq_irq(struct msdc_host *host, u32 intsts) > cmd_err, dat_err, intsts); > } > > - return cqhci_irq(mmc, 0, cmd_err, dat_err); > + return cqhci_irq(mmc, cmd_err, dat_err); > } > > static irqreturn_t msdc_irq(int irq, void *dev_id) > diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c > index 57e45951644e..1de2f05fd958 100644 > --- a/drivers/mmc/host/sdhci-brcmstb.c > +++ b/drivers/mmc/host/sdhci-brcmstb.c > @@ -430,7 +430,7 @@ static u32 sdhci_brcmstb_cqhci_irq(struct sdhci_host *host, u32 intmask) > if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error)) > return intmask; > > - cqhci_irq(host->mmc, intmask, cmd_error, data_error); > + cqhci_irq(host->mmc, cmd_error, data_error); > > return 0; > } > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 18ecddd6df6f..d0fa83f67a80 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -1503,7 +1503,7 @@ static u32 esdhc_cqhci_irq(struct sdhci_host *host, u32 intmask) > if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error)) > return intmask; > > - cqhci_irq(host->mmc, intmask, cmd_error, data_error); > + cqhci_irq(host->mmc, cmd_error, data_error); > > return 0; > } > diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c > index 0882ce74e0c9..ceed47ccfda8 100644 > --- a/drivers/mmc/host/sdhci-msm.c > +++ b/drivers/mmc/host/sdhci-msm.c > @@ -2165,7 +2165,7 @@ static u32 sdhci_msm_cqe_irq(struct sdhci_host *host, u32 intmask) > if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error)) > return intmask; > > - cqhci_irq(host->mmc, intmask, cmd_error, data_error); > + cqhci_irq(host->mmc, cmd_error, data_error); > return 0; > } > > diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c > index 785d3acb18c5..4ca73e7d799e 100644 > --- a/drivers/mmc/host/sdhci-of-arasan.c > +++ b/drivers/mmc/host/sdhci-of-arasan.c > @@ -555,7 +555,7 @@ static u32 sdhci_arasan_cqhci_irq(struct sdhci_host *host, u32 intmask) > if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error)) > return intmask; > > - cqhci_irq(host->mmc, intmask, cmd_error, data_error); > + cqhci_irq(host->mmc, cmd_error, data_error); > > return 0; > } > diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c > index eef53455b8ee..4c5fa6a6931d 100644 > --- a/drivers/mmc/host/sdhci-of-dwcmshc.c > +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c > @@ -624,7 +624,7 @@ static u32 dwcmshc_cqe_irq_handler(struct sdhci_host *host, u32 intmask) > if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error)) > return intmask; > > - cqhci_irq(host->mmc, intmask, cmd_error, data_error); > + cqhci_irq(host->mmc, cmd_error, data_error); > > return 0; > } > diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c > index c347fac24515..b121d896a804 100644 > --- a/drivers/mmc/host/sdhci-pci-core.c > +++ b/drivers/mmc/host/sdhci-pci-core.c > @@ -215,7 +215,7 @@ static u32 sdhci_cqhci_irq(struct sdhci_host *host, u32 intmask) > if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error)) > return intmask; > > - cqhci_irq(host->mmc, intmask, cmd_error, data_error); > + cqhci_irq(host->mmc, cmd_error, data_error); > > return 0; > } > diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c > index 6e4084407662..b55618566d65 100644 > --- a/drivers/mmc/host/sdhci-pci-gli.c > +++ b/drivers/mmc/host/sdhci-pci-gli.c > @@ -1760,7 +1760,7 @@ static u32 sdhci_gl9763e_cqhci_irq(struct sdhci_host *host, u32 intmask) > if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error)) > return intmask; > > - cqhci_irq(host->mmc, intmask, cmd_error, data_error); > + cqhci_irq(host->mmc, cmd_error, data_error); > > return 0; > } > diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c > index 820ce4dae58b..221e48b59f48 100644 > --- a/drivers/mmc/host/sdhci-tegra.c > +++ b/drivers/mmc/host/sdhci-tegra.c > @@ -1280,7 +1280,7 @@ static u32 sdhci_tegra_cqhci_irq(struct sdhci_host *host, u32 intmask) > if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error)) > return intmask; > > - cqhci_irq(host->mmc, intmask, cmd_error, data_error); > + cqhci_irq(host->mmc, cmd_error, data_error); > > return 0; > } > diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c > index d235b0aecfdb..2a27db2f558b 100644 > --- a/drivers/mmc/host/sdhci_am654.c > +++ b/drivers/mmc/host/sdhci_am654.c > @@ -462,7 +462,7 @@ static u32 sdhci_am654_cqhci_irq(struct sdhci_host *host, u32 intmask) > if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error)) > return intmask; > > - cqhci_irq(host->mmc, intmask, cmd_error, data_error); > + cqhci_irq(host->mmc, cmd_error, data_error); > > return 0; > } > -- > 2.43.0 >