Merge remote branch 'wireless-next/master' into ath6kl-next

[~andy/linux] / drivers / rtc / rtc-s35390a.c

diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c
index f789e002c9b013664a2588ea342b25a52acf8a1c..c9562ceedef39a68d0991fca892a4e337596bcda 100644 (file)
--- a/drivers/rtc/rtc-s35390a.c
+++ b/drivers/rtc/rtc-s35390a.c
@@ -304,19 +304,8 @@ static struct i2c_driver s35390a_driver = {
        .id_table       = s35390a_id,
 };
 
-static int __init s35390a_rtc_init(void)
-{
-       return i2c_add_driver(&s35390a_driver);
-}
-
-static void __exit s35390a_rtc_exit(void)
-{
-       i2c_del_driver(&s35390a_driver);
-}
+module_i2c_driver(s35390a_driver);
 
 MODULE_AUTHOR("Byron Bradley <byron.bbradley@gmail.com>");
 MODULE_DESCRIPTION("S35390A RTC driver");
 MODULE_LICENSE("GPL");
-
-module_init(s35390a_rtc_init);
-module_exit(s35390a_rtc_exit);