lkml.org 
[lkml]   [2018]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v1 09/16] rtc: mediatek: convert to use device managed functions
    On 23/03/2018 at 17:15:06 +0800, sean.wang@mediatek.com wrote:
    > From: Sean Wang <sean.wang@mediatek.com>
    >
    > Use device managed operation to simplify error handling, reduce source
    > code size, and reduce the likelyhood of bugs, and remove our removal
    > callback which contains anything already done by device managed functions.
    >
    > Signed-off-by: Sean Wang <sean.wang@mediatek.com>
    > ---
    > drivers/rtc/rtc-mt6397.c | 31 ++++++++-----------------------
    > 1 file changed, 8 insertions(+), 23 deletions(-)
    >
    > diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c
    > index cefb83b..bfc5d6f 100644
    > --- a/drivers/rtc/rtc-mt6397.c
    > +++ b/drivers/rtc/rtc-mt6397.c
    > @@ -14,6 +14,7 @@
    >
    > #include <linux/delay.h>
    > #include <linux/init.h>
    > +#include <linux/interrupt.h>
    > #include <linux/module.h>
    > #include <linux/regmap.h>
    > #include <linux/rtc.h>
    > @@ -328,10 +329,10 @@ static int mtk_rtc_probe(struct platform_device *pdev)
    >
    > platform_set_drvdata(pdev, rtc);
    >
    > - ret = request_threaded_irq(rtc->irq, NULL,
    > - mtk_rtc_irq_handler_thread,
    > - IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
    > - "mt6397-rtc", rtc);
    > + ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
    > + mtk_rtc_irq_handler_thread,
    > + IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
    > + "mt6397-rtc", rtc);
    > if (ret) {
    > dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
    > rtc->irq, ret);
    > @@ -340,30 +341,15 @@ static int mtk_rtc_probe(struct platform_device *pdev)
    >
    > device_init_wakeup(&pdev->dev, 1);
    >
    > - rtc->rtc_dev = rtc_device_register("mt6397-rtc", &pdev->dev,
    > - &mtk_rtc_ops, THIS_MODULE);
    > + rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "mt6397-rtc",
    > + &mtk_rtc_ops, THIS_MODULE);

    You should probably switch to devm_rtc_allocate_device() and
    rtc_register_device instead of devm_rtc_device_register.

    > if (IS_ERR(rtc->rtc_dev)) {
    > dev_err(&pdev->dev, "register rtc device failed\n");
    > ret = PTR_ERR(rtc->rtc_dev);
    > - goto out_free_irq;
    > + return ret;

    ret doesn't seem necessary anymore here.


    --
    Alexandre Belloni, Bootlin (formerly Free Electrons)
    Embedded Linux and Kernel engineering
    https://bootlin.com

    \
     
     \ /
      Last update: 2018-03-23 11:51    [W:2.123 / U:0.380 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site