Re: Patch "mmc: meson-gx: fix interrupt name" has been added to the 4.20-stable tree

Re: Patch "mmc: meson-gx: fix interrupt name" has been added to the 4.20-stable tree

[Greg KH]

On Thu, Feb 21, 2019 at 12:43:25AM -0500, Sasha Levin wrote:
> This is a note to let you know that I've just added the patch titled
> 
>     mmc: meson-gx: fix interrupt name
> 
> to the 4.20-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> 
> The filename of the patch is:
>      mmc-meson-gx-fix-interrupt-name.patch
> and it can be found in the queue-4.20 subdirectory.
> 
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
> 
> 
> 
> commit 2f7d5e26da383aca9f3a1270138d033e2a0e7be2
> Author: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> Date:   Sat Feb 9 01:58:50 2019 +0100
> 
>     mmc: meson-gx: fix interrupt name
>     
>     [ Upstream commit 83e418a805d880a8b18add07f94d19b2a5a80307 ]
>     
>     Commit bb364890323cca ("mmc: meson-gx: Free irq in release() callback")
>     changed the _probe code to use request_threaded_irq() instead of
>     devm_request_threaded_irq().
>     Unfortunately this removes a fallback for the interrupt name:
>     devm_request_threaded_irq() uses the device name as fallback if the
>     given IRQ name is NULL. request_threaded_irq() has no such fallback,
>     thus /proc/interrupts shows "(null)" instead.
>     
>     Explicitly pass the dev_name() so we get the IRQ name shown in
>     /proc/interrupts again.
>     While here, also fix the indentation of the request_threaded_irq()
>     parameter list.
>     
>     Fixes: bb364890323cca ("mmc: meson-gx: Free irq in release() callback")
>     Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
>     Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
>     Signed-off-by: Sasha Levin <sashal@kernel.org>
> 
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index ef9deaa361c73..ddd98cdd33bcd 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -1286,7 +1286,8 @@ static int meson_mmc_probe(struct platform_device *pdev)
>  	       host->regs + SD_EMMC_IRQ_EN);
>  
>  	ret = request_threaded_irq(host->irq, meson_mmc_irq,
> -			meson_mmc_irq_thread, IRQF_SHARED, NULL, host);
> +				   meson_mmc_irq_thread, IRQF_SHARED,
> +				   dev_name(&pdev->dev), host);
>  	if (ret)
>  		goto err_init_clk;
> 

This also looks like it is needed in 4.19.y, any reason you didn't add
it there?

now queued up.

greg k-h