Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[~andy/linux] / drivers / staging / iio / light / isl29018.c

diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index f0c733a2826a09ae4366d8d19ce2019f00ebb38a..849d6a564afa956002a6b18610042d25abdcbd9a 100644 (file)
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -602,19 +602,7 @@ static struct i2c_driver isl29018_driver = {
        .remove  = __devexit_p(isl29018_remove),
        .id_table = isl29018_id,
 };
-
-static int __init isl29018_init(void)
-{
-       return i2c_add_driver(&isl29018_driver);
-}
-
-static void __exit isl29018_exit(void)
-{
-       i2c_del_driver(&isl29018_driver);
-}
-
-module_init(isl29018_init);
-module_exit(isl29018_exit);
+module_i2c_driver(isl29018_driver);
 
 MODULE_DESCRIPTION("ISL29018 Ambient Light Sensor driver");
 MODULE_LICENSE("GPL");