aboutsummaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-ds3234.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-03-28 13:53:10 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-03-28 13:53:10 +0900
commit18af30e259c25a64ad69bb749c661564bc886275 (patch)
tree996c89594fd20f25fcc15b5843625d99473f6982 /drivers/rtc/rtc-ds3234.c
parent691c01c3f0b3252308162de90edcd02f7ca1733c (diff)
parent6658a6991cef75719a21441aa0b7f8d6821534ee (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'drivers/rtc/rtc-ds3234.c')
-rw-r--r--drivers/rtc/rtc-ds3234.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c
index bbd26228f53..fda707926f0 100644
--- a/drivers/rtc/rtc-ds3234.c
+++ b/drivers/rtc/rtc-ds3234.c
@@ -173,17 +173,7 @@ static struct spi_driver ds3234_driver = {
.remove = __devexit_p(ds3234_remove),
};
-static __init int ds3234_init(void)
-{
- return spi_register_driver(&ds3234_driver);
-}
-module_init(ds3234_init);
-
-static __exit void ds3234_exit(void)
-{
- spi_unregister_driver(&ds3234_driver);
-}
-module_exit(ds3234_exit);
+module_spi_driver(ds3234_driver);
MODULE_DESCRIPTION("DS3234 SPI RTC driver");
MODULE_AUTHOR("Dennis Aberilla <denzzzhome@yahoo.com>");