From: Jingoo Han Date: Tue, 26 Mar 2013 23:25:36 +0000 (+1100) Subject: rtc: rtc-generic: use devm_rtc_device_register() X-Git-Tag: next-20130404~3^2~187 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=245c4a54d5ef70be6f16f17a369b1895573919ec;p=karo-tx-linux.git rtc: rtc-generic: use devm_rtc_device_register() devm_rtc_device_register() is device managed and makes cleanup paths simpler. Signed-off-by: Jingoo Han Signed-off-by: Andrew Morton --- diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c index 0bf4530e18b0..06279ce6bff2 100644 --- a/drivers/rtc/rtc-generic.c +++ b/drivers/rtc/rtc-generic.c @@ -38,8 +38,8 @@ static int __init generic_rtc_probe(struct platform_device *dev) { struct rtc_device *rtc; - rtc = rtc_device_register("rtc-generic", &dev->dev, &generic_rtc_ops, - THIS_MODULE); + rtc = devm_rtc_device_register(&dev->dev, "rtc-generic", + &generic_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return PTR_ERR(rtc); @@ -50,10 +50,6 @@ static int __init generic_rtc_probe(struct platform_device *dev) static int __exit generic_rtc_remove(struct platform_device *dev) { - struct rtc_device *rtc = platform_get_drvdata(dev); - - rtc_device_unregister(rtc); - return 0; }