X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Frtc%2Frtc-da9055.c;h=73858ca9709a1eb6f6af06882f099fe2f9d1d930;hb=17581718051076714d72ef24f46dc08402cd5373;hp=8f0dcfedb83cdfb9c613083574e8e591826beaf5;hpb=152fcb2784c9305e19e7caee2932b9e32b0a1d41;p=~andy%2Flinux

diff --git a/drivers/rtc/rtc-da9055.c b/drivers/rtc/rtc-da9055.c
index 8f0dcfedb83..73858ca9709 100644
--- a/drivers/rtc/rtc-da9055.c
+++ b/drivers/rtc/rtc-da9055.c
@@ -294,7 +294,7 @@ static int da9055_rtc_probe(struct platform_device *pdev)
 
 	device_init_wakeup(&pdev->dev, 1);
 
-	rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+	rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
 					&da9055_rtc_ops, THIS_MODULE);
 	if (IS_ERR(rtc->rtc)) {
 		ret = PTR_ERR(rtc->rtc);
@@ -317,9 +317,6 @@ err_rtc:
 
 static int da9055_rtc_remove(struct platform_device *pdev)
 {
-	struct da9055_rtc *rtc = pdev->dev.platform_data;
-
-	rtc_device_unregister(rtc->rtc);
 	platform_set_drvdata(pdev, NULL);
 
 	return 0;