lkml.org 
[lkml]   [2020]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/59] rtc: max8907: stop using deprecated RTC API
    Date
    From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

    devm_rtc_device_register() is deprecated. Use devm_rtc_allocate_device()
    and devm_rtc_register_device() pair instead.

    Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    ---
    drivers/rtc/rtc-max8907.c | 14 ++++++--------
    1 file changed, 6 insertions(+), 8 deletions(-)

    diff --git a/drivers/rtc/rtc-max8907.c b/drivers/rtc/rtc-max8907.c
    index db3495d10274..7987f7f99bcc 100644
    --- a/drivers/rtc/rtc-max8907.c
    +++ b/drivers/rtc/rtc-max8907.c
    @@ -186,13 +186,11 @@ static int max8907_rtc_probe(struct platform_device *pdev)
    rtc->max8907 = max8907;
    rtc->regmap = max8907->regmap_rtc;

    - rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8907-rtc",
    - &max8907_rtc_ops, THIS_MODULE);
    - if (IS_ERR(rtc->rtc_dev)) {
    - ret = PTR_ERR(rtc->rtc_dev);
    - dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
    - return ret;
    - }
    + rtc->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
    + if (IS_ERR(rtc->rtc_dev))
    + return PTR_ERR(rtc->rtc_dev);
    +
    + rtc->rtc_dev->ops = &max8907_rtc_ops;

    rtc->irq = regmap_irq_get_virq(max8907->irqc_rtc,
    MAX8907_IRQ_RTC_ALARM0);
    @@ -206,7 +204,7 @@ static int max8907_rtc_probe(struct platform_device *pdev)
    dev_err(&pdev->dev, "Failed to request IRQ%d: %d\n",
    rtc->irq, ret);

    - return ret;
    + return devm_rtc_register_device(rtc->rtc_dev);
    }

    static struct platform_driver max8907_rtc_driver = {
    --
    2.29.1
    \
     
     \ /
      Last update: 2020-11-19 12:48    [W:4.140 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site