projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'lsk-v3.10-15.04-android'
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-ep93xx.c
diff --git
a/drivers/rtc/rtc-ep93xx.c
b/drivers/rtc/rtc-ep93xx.c
index 1a4e5e4a70cddcd4eba6fa9f304184a25532374a..5807b77c444a86df3790046ff158f2cb994af244 100644
(file)
--- a/
drivers/rtc/rtc-ep93xx.c
+++ b/
drivers/rtc/rtc-ep93xx.c
@@
-153,8
+153,8
@@
static int ep93xx_rtc_probe(struct platform_device *pdev)
pdev->dev.platform_data = ep93xx_rtc;
platform_set_drvdata(pdev, ep93xx_rtc);
pdev->dev.platform_data = ep93xx_rtc;
platform_set_drvdata(pdev, ep93xx_rtc);
- ep93xx_rtc->rtc =
rtc_device_register(pdev->name
,
-
&pdev->dev
, &ep93xx_rtc_ops, THIS_MODULE);
+ ep93xx_rtc->rtc =
devm_rtc_device_register(&pdev->dev
,
+
pdev->name
, &ep93xx_rtc_ops, THIS_MODULE);
if (IS_ERR(ep93xx_rtc->rtc)) {
err = PTR_ERR(ep93xx_rtc->rtc);
goto exit;
if (IS_ERR(ep93xx_rtc->rtc)) {
err = PTR_ERR(ep93xx_rtc->rtc);
goto exit;
@@
-162,12
+162,10
@@
static int ep93xx_rtc_probe(struct platform_device *pdev)
err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
if (err)
err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
if (err)
- goto
fail
;
+ goto
exit
;
return 0;
return 0;
-fail:
- rtc_device_unregister(ep93xx_rtc->rtc);
exit:
platform_set_drvdata(pdev, NULL);
pdev->dev.platform_data = NULL;
exit:
platform_set_drvdata(pdev, NULL);
pdev->dev.platform_data = NULL;
@@
-176,11
+174,8
@@
exit:
static int ep93xx_rtc_remove(struct platform_device *pdev)
{
static int ep93xx_rtc_remove(struct platform_device *pdev)
{
- struct ep93xx_rtc *ep93xx_rtc = platform_get_drvdata(pdev);
-
sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
platform_set_drvdata(pdev, NULL);
sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
platform_set_drvdata(pdev, NULL);
- rtc_device_unregister(ep93xx_rtc->rtc);
pdev->dev.platform_data = NULL;
return 0;
pdev->dev.platform_data = NULL;
return 0;