From: Jingoo Han Date: Wed, 20 Mar 2013 04:08:17 +0000 (+1100) Subject: rtc: rtc-max6902: use devm_rtc_device_register() X-Git-Tag: next-20130322~1^2~143 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=19fe37923eec64ae18f5fa45d64c0385fd8bee2f;p=karo-tx-linux.git rtc: rtc-max6902: 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-max6902.c b/drivers/rtc/rtc-max6902.c index 7d0bf698b79e..7e4491b1f90b 100644 --- a/drivers/rtc/rtc-max6902.c +++ b/drivers/rtc/rtc-max6902.c @@ -134,8 +134,8 @@ static int max6902_probe(struct spi_device *spi) if (res != 0) return res; - rtc = rtc_device_register("max6902", - &spi->dev, &max6902_rtc_ops, THIS_MODULE); + rtc = devm_rtc_device_register(&spi->dev, "max6902", + &max6902_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return PTR_ERR(rtc); @@ -145,9 +145,6 @@ static int max6902_probe(struct spi_device *spi) static int max6902_remove(struct spi_device *spi) { - struct rtc_device *rtc = dev_get_drvdata(&spi->dev); - - rtc_device_unregister(rtc); return 0; }