@@ -272,8 +272,8 @@ static int st_rtc_probe(struct platform_device *pdev)
st_rtc_set_time(&pdev->dev, &tm_check);
}
- rtc->rtc_dev = rtc_device_register("st-lpc-rtc", &pdev->dev,
- &st_rtc_ops, THIS_MODULE);
+ rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "st-lpc-rtc",
+ &st_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc_dev)) {
clk_disable_unprepare(rtc->clk);
return PTR_ERR(rtc->rtc_dev);
@@ -282,16 +282,6 @@ static int st_rtc_probe(struct platform_device *pdev)
return 0;
}
-static int st_rtc_remove(struct platform_device *pdev)
-{
- struct st_rtc *rtc = platform_get_drvdata(pdev);
-
- if (likely(rtc->rtc_dev))
- rtc_device_unregister(rtc->rtc_dev);
-
- return 0;
-}
-
#ifdef CONFIG_PM_SLEEP
static int st_rtc_suspend(struct device *dev)
{
@@ -344,7 +334,6 @@ static int st_rtc_resume(struct device *dev)
.of_match_table = st_rtc_match,
},
.probe = st_rtc_probe,
- .remove = st_rtc_remove,
};
module_platform_driver(st_rtc_platform_driver);
Using devm_rtc_device_register() helper to simplify code. Cc: Patrice Chotard <patrice.chotard@st.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- drivers/rtc/rtc-st-lpc.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) -- 1.7.12.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel