aboutsummaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-rx4581.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/rtc/rtc-rx4581.c')
-rw-r--r--drivers/rtc/rtc-rx4581.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/rtc/rtc-rx4581.c b/drivers/rtc/rtc-rx4581.c
index 599ec73ec88..6889222f9ed 100644
--- a/drivers/rtc/rtc-rx4581.c
+++ b/drivers/rtc/rtc-rx4581.c
@@ -273,20 +273,12 @@ static int rx4581_probe(struct spi_device *spi)
if (res != 0)
return res;
- rtc = rtc_device_register("rx4581",
- &spi->dev, &rx4581_rtc_ops, THIS_MODULE);
+ rtc = devm_rtc_device_register(&spi->dev, "rx4581",
+ &rx4581_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc))
return PTR_ERR(rtc);
- dev_set_drvdata(&spi->dev, rtc);
- return 0;
-}
-
-static int rx4581_remove(struct spi_device *spi)
-{
- struct rtc_device *rtc = dev_get_drvdata(&spi->dev);
-
- rtc_device_unregister(rtc);
+ spi_set_drvdata(spi, rtc);
return 0;
}
@@ -302,7 +294,6 @@ static struct spi_driver rx4581_driver = {
.owner = THIS_MODULE,
},
.probe = rx4581_probe,
- .remove = rx4581_remove,
.id_table = rx4581_id,
};