diff mbox series

[4.4.y-cip,56/83] mmc: host: tmio: refactor calls to sdio irq

Message ID 1573115572-13513-57-git-send-email-biju.das@bp.renesas.com (mailing list archive)
State Changes Requested
Headers show
Series Add RZ/G1C SD/eMMC support | expand

Commit Message

Biju Das Nov. 7, 2019, 8:32 a.m. UTC 
From: Wolfram Sang <wsa+renesas@sang-engineering.com>

commit e4f38eb18aedd098b3019e82df07f583a5cbcc58 upstream.

tmio_mmc_sdio_irq() is not used as a seperate irq handler anymore, so we
can make it similar to the other irq helper functions, namely:

* only give the host as argument function which is what it really needs
* prefix function name with __

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
 drivers/mmc/host/tmio_mmc_pio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Pavel Machek Nov. 8, 2019, 9:42 a.m. UTC | #1 
On Thu 2019-11-07 08:32:25, Biju Das wrote:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> 
> commit e4f38eb18aedd098b3019e82df07f583a5cbcc58 upstream.
> 
> tmio_mmc_sdio_irq() is not used as a seperate irq handler anymore, so we
> can make it similar to the other irq helper functions, namely:
> 
> * only give the host as argument function which is what it really needs
> * prefix function name with __
> 

> +++ b/drivers/mmc/host/tmio_mmc_pio.c
> @@ -709,7 +709,7 @@ static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host,
>  	return false;
>  }
>  
> -static bool tmio_mmc_sdio_irq(int irq, void *devid)
> +static bool __tmio_mmc_sdio_irq(int irq, void *devid)
>  {
>  	struct tmio_mmc_host *host = devid;
>  	struct mmc_host *mmc = host->mmc;


In mainline, the commit removes the argument, as it says in the
changelog. Not here in the backport. Why the difference?

Best regards,
							Pavel
Biju Das Nov. 8, 2019, 1:26 p.m. UTC | #2 
Hi Pavel,

Thanks for the feedback.

> Subject: Re: [PATCH 4.4.y-cip 56/83] mmc: host: tmio: refactor calls to sdio irq
> 
> On Thu 2019-11-07 08:32:25, Biju Das wrote:
> > From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> >
> > commit e4f38eb18aedd098b3019e82df07f583a5cbcc58 upstream.
> >
> > tmio_mmc_sdio_irq() is not used as a seperate irq handler anymore, so
> > we can make it similar to the other irq helper functions, namely:
> >
> > * only give the host as argument function which is what it really
> > needs
> > * prefix function name with __
> >
> 
> > +++ b/drivers/mmc/host/tmio_mmc_pio.c
> > @@ -709,7 +709,7 @@ static bool __tmio_mmc_sdcard_irq(struct
> tmio_mmc_host *host,
> >  	return false;
> >  }
> >
> > -static bool tmio_mmc_sdio_irq(int irq, void *devid)
> > +static bool __tmio_mmc_sdio_irq(int irq, void *devid)
> >  {
> >  	struct tmio_mmc_host *host = devid;
> >  	struct mmc_host *mmc = host->mmc;
> 
> 
> In mainline, the commit removes the argument, as it says in the changelog.
> Not here in the backport. Why the difference?
> 
Good catch. I will check this. It should not deviate from the original patch.

I will check and let you know.

Regards,
Biju
diff mbox series

Patch

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 9fe6d65..0a3f411 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -709,7 +709,7 @@  static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host,
 	return false;
 }
 
-static bool tmio_mmc_sdio_irq(int irq, void *devid)
+static bool __tmio_mmc_sdio_irq(int irq, void *devid)
 {
 	struct tmio_mmc_host *host = devid;
 	struct mmc_host *mmc = host->mmc;
@@ -754,7 +754,7 @@  irqreturn_t tmio_mmc_irq(int irq, void *devid)
 	if (__tmio_mmc_sdcard_irq(host, ireg, status))
 		return IRQ_HANDLED;
 
-	if (tmio_mmc_sdio_irq(irq, devid))
+	if (__tmio_mmc_sdio_irq(irq, devid))
 		return IRQ_HANDLED;
 
 	return IRQ_NONE;