| Message ID | 20191204072826.117432-1-maowenan@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,-next] rtc: mt6397: drop free_irq of devm_xx allocated irq | expand |
On 04/12/2019 15:28:26+0800, Mao Wenan wrote: > rtc->irq is requested by devm_request_threaded_irq, > and request_threaded_irq. IRQs requested with this > function will be automatically freed on driver detach. > This patch remove unused error label as well. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Mao Wenan <maowenan@huawei.com> > --- > v2: remove error label as Dan Carpenter suggest. > drivers/rtc/rtc-mt6397.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c > index 5249fc99fd5f..14f3c4915260 100644 > --- a/drivers/rtc/rtc-mt6397.c > +++ b/drivers/rtc/rtc-mt6397.c > @@ -287,13 +287,6 @@ static int mtk_rtc_probe(struct platform_device *pdev) > rtc->rtc_dev->ops = &mtk_rtc_ops; > > ret = rtc_register_device(rtc->rtc_dev); > - if (ret) > - goto out_free_irq; > - > - return 0; > - > -out_free_irq: > - free_irq(rtc->irq, rtc); > return ret; Maybe return rtc_register_device(rtc->rtc_dev); > } > > -- > 2.20.1 >
On 04/12/2019 09:40:38+0100, Alexandre Belloni wrote: > On 04/12/2019 15:28:26+0800, Mao Wenan wrote: > > rtc->irq is requested by devm_request_threaded_irq, > > and request_threaded_irq. IRQs requested with this > > function will be automatically freed on driver detach. > > This patch remove unused error label as well. > > > > Reported-by: Hulk Robot <hulkci@huawei.com> > > Signed-off-by: Mao Wenan <maowenan@huawei.com> > > --- > > v2: remove error label as Dan Carpenter suggest. > > drivers/rtc/rtc-mt6397.c | 7 ------- > > 1 file changed, 7 deletions(-) > > > > diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c > > index 5249fc99fd5f..14f3c4915260 100644 > > --- a/drivers/rtc/rtc-mt6397.c > > +++ b/drivers/rtc/rtc-mt6397.c > > @@ -287,13 +287,6 @@ static int mtk_rtc_probe(struct platform_device *pdev) > > rtc->rtc_dev->ops = &mtk_rtc_ops; > > > > ret = rtc_register_device(rtc->rtc_dev); > > - if (ret) > > - goto out_free_irq; > > - > > - return 0; > > - > > -out_free_irq: > > - free_irq(rtc->irq, rtc); > > return ret; > > Maybe return rtc_register_device(rtc->rtc_dev); > By the way, this was already properly submitted here: https://patchwork.ozlabs.org/patch/1193956/ So I'll apply this one once the merge window ends (it depends on the MFD pull request, that is why I didn't apply it yet).
diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c index 5249fc99fd5f..14f3c4915260 100644 --- a/drivers/rtc/rtc-mt6397.c +++ b/drivers/rtc/rtc-mt6397.c @@ -287,13 +287,6 @@ static int mtk_rtc_probe(struct platform_device *pdev) rtc->rtc_dev->ops = &mtk_rtc_ops; ret = rtc_register_device(rtc->rtc_dev); - if (ret) - goto out_free_irq; - - return 0; - -out_free_irq: - free_irq(rtc->irq, rtc); return ret; }
rtc->irq is requested by devm_request_threaded_irq, and request_threaded_irq. IRQs requested with this function will be automatically freed on driver detach. This patch remove unused error label as well. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Mao Wenan <maowenan@huawei.com> --- v2: remove error label as Dan Carpenter suggest. drivers/rtc/rtc-mt6397.c | 7 ------- 1 file changed, 7 deletions(-)