From: Jingoo Han Date: Mon, 29 Apr 2013 23:19:45 +0000 (-0700) Subject: rtc: rtc-r9701: use devm_rtc_device_register() X-Git-Tag: upstream/snapshot3+hdmi~5276^2~120 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b6d955aedf84ab5e97cda73c6df9ea17952a3d4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git rtc: rtc-r9701: 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 Signed-off-by: Linus Torvalds --- diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c index 7726f4a..0adf5b5 100644 --- a/drivers/rtc/rtc-r9701.c +++ b/drivers/rtc/rtc-r9701.c @@ -154,8 +154,8 @@ static int r9701_probe(struct spi_device *spi) } } - rtc = rtc_device_register("r9701", - &spi->dev, &r9701_rtc_ops, THIS_MODULE); + rtc = devm_rtc_device_register(&spi->dev, "r9701", + &r9701_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return PTR_ERR(rtc); @@ -166,9 +166,6 @@ static int r9701_probe(struct spi_device *spi) static int r9701_remove(struct spi_device *spi) { - struct rtc_device *rtc = dev_get_drvdata(&spi->dev); - - rtc_device_unregister(rtc); return 0; }