Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / hwmon / tmp401.c

diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c
index 8b9a77486d57b8a1c7a9e8371ef160cfe75d53a3..ea54c3384671e2ad3281f0654c205c5715d2763c 100644 (file)
--- a/drivers/hwmon/tmp401.c
+++ b/drivers/hwmon/tmp401.c
@@ -624,7 +624,7 @@ static int tmp401_probe(struct i2c_client *client,
                        goto exit_remove;
        }
 
-       /* Register aditional tmp411 sysfs hooks */
+       /* Register additional tmp411 sysfs hooks */
        if (data->kind == tmp411) {
                for (i = 0; i < ARRAY_SIZE(tmp411_attr); i++) {
                        err = device_create_file(&client->dev,
@@ -662,19 +662,8 @@ static struct i2c_driver tmp401_driver = {
        .address_list   = normal_i2c,
 };
 
-static int __init tmp401_init(void)
-{
-       return i2c_add_driver(&tmp401_driver);
-}
-
-static void __exit tmp401_exit(void)
-{
-       i2c_del_driver(&tmp401_driver);
-}
+module_i2c_driver(tmp401_driver);
 
 MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 MODULE_DESCRIPTION("Texas Instruments TMP401 temperature sensor driver");
 MODULE_LICENSE("GPL");
-
-module_init(tmp401_init);
-module_exit(tmp401_exit);