[PATCH] v4l: i2c cleanups

This patch has some minor cleanups for the v4l i2c modules: Don't ignore
the i2c_add_driver return value and mark the init+exit functions with
__init + __exit.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 41adfef5c715667c934606576f36b2b6f5706a0a..b606096164b9ecce36e061b33c45e1da44c6fd1a 100644 (file)
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1552,13 +1552,12 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 /* ----------------------------------------------------------------------- */
 
-static int msp3400_init_module(void)
+static int __init msp3400_init_module(void)
 {
-       i2c_add_driver(&driver);
-       return 0;
+       return i2c_add_driver(&driver);
 }
 
-static void msp3400_cleanup_module(void)
+static void __exit msp3400_cleanup_module(void)
 {
        i2c_del_driver(&driver);
 }

diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 4365d9485ff60160178590fed3eae3405ecb87d6..20051a00cf3920571481c9e3b81298750721d1ef 100644 (file)
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -532,17 +532,17 @@ static struct i2c_client client_template =
        .driver     = &driver, 
 };
 
-static int tda7432_init(void)
+static int __init tda7432_init(void)
 {
        if ( (loudness < 0) || (loudness > 15) ) {
                printk(KERN_ERR "tda7432: loudness parameter must be between 0 and 15\n");
                return -EINVAL;
        }
-       i2c_add_driver(&driver);
-       return 0;
+
+       return i2c_add_driver(&driver);
 }
 
-static void tda7432_fini(void)
+static void __exit tda7432_fini(void)
 {
        i2c_del_driver(&driver);
 }

diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index ae5fd316fba0a6c553c50de8c47c320eafa27185..41327c3f7b264551bbde95c31d9d1eab2230df77 100644 (file)
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -403,13 +403,12 @@ static struct i2c_client client_template =
         .driver    = &driver,
 };
 
-static int tda9875_init(void)
+static int __init tda9875_init(void)
 {
-       i2c_add_driver(&driver);
-       return 0;
+       return i2c_add_driver(&driver);
 }
 
-static void tda9875_fini(void)
+static void __exit tda9875_fini(void)
 {
        i2c_del_driver(&driver);
 }

diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index bf5017a7766c1d12f0c784b3ef7ce5d2371724db..b435bcef92607adcd253c025b024a7a532807bc5 100644 (file)
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1651,7 +1651,7 @@ static struct i2c_client client_template =
         .driver     = &driver,
 };
 
-static int audiochip_init_module(void)
+static int __init audiochip_init_module(void)
 {
        struct CHIPDESC  *desc;
        printk(KERN_INFO "tvaudio: TV audio decoder + audio/video mux driver\n");
@@ -1659,11 +1659,11 @@ static int audiochip_init_module(void)
        for (desc = chiplist; desc->name != NULL; desc++)
                printk("%s%s", (desc == chiplist) ? "" : ",",desc->name);
        printk("\n");
-       i2c_add_driver(&driver);
-       return 0;
+
+       return i2c_add_driver(&driver);
 }
 
-static void audiochip_cleanup_module(void)
+static void __exit audiochip_cleanup_module(void)
 {
        i2c_del_driver(&driver);
 }

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 48b2f822e6c7f594ca74414ad1567a785d0ba263..20cb7647ff2e6777219eda8e0501f7d21994267b 100644 (file)
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -330,17 +330,17 @@ static int tvmixer_clients(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
-static int tvmixer_init_module(void)
+static int __init tvmixer_init_module(void)
 {
        int i;
        
        for (i = 0; i < DEV_MAX; i++)
                devices[i].minor = -1;
-       i2c_add_driver(&driver);
-       return 0;
+
+       return i2c_add_driver(&driver);
 }
 
-static void tvmixer_cleanup_module(void)
+static void __exit tvmixer_cleanup_module(void)
 {
        int i;
        

diff --git a/include/media/id.h b/include/media/id.h
index dca5dcfc054b6dc4abaabe070ed062b79adf3bc0..1b0320dc8f73cd79fa9ec09f1c1541369df9953e 100644 (file)
--- a/include/media/id.h
+++ b/include/media/id.h
@@ -35,4 +35,3 @@
 #ifndef I2C_ALGO_SAA7134
 # define I2C_ALGO_SAA7134 0x090000
 #endif
-