summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/bt832.c7
-rw-r--r--linux/drivers/media/video/ir-kbd-i2c.c7
-rw-r--r--linux/drivers/media/video/msp3400-driver.c7
-rw-r--r--linux/drivers/media/video/msp3400.c7
-rw-r--r--linux/drivers/media/video/saa6752hs.c7
-rw-r--r--linux/drivers/media/video/saa7134/saa6752hs.c7
-rw-r--r--linux/drivers/media/video/tda7432.c8
-rw-r--r--linux/drivers/media/video/tda9875.c7
-rw-r--r--linux/drivers/media/video/tda9887.c7
-rw-r--r--linux/drivers/media/video/tvaudio.c8
-rw-r--r--linux/drivers/media/video/tvmixer.c8
11 files changed, 36 insertions, 44 deletions
diff --git a/linux/drivers/media/video/bt832.c b/linux/drivers/media/video/bt832.c
index 1b7a4f961..59e5d2b10 100644
--- a/linux/drivers/media/video/bt832.c
+++ b/linux/drivers/media/video/bt832.c
@@ -278,13 +278,12 @@ static struct i2c_client client_template =
};
-int bt832_init_module(void)
+static int __init bt832_init_module(void)
{
- i2c_add_driver(&driver);
- return 0;
+ return i2c_add_driver(&driver);
}
-static void bt832_cleanup_module(void)
+static void __exit bt832_cleanup_module(void)
{
i2c_del_driver(&driver);
}
diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c
index c00043a2e..bf99ddd24 100644
--- a/linux/drivers/media/video/ir-kbd-i2c.c
+++ b/linux/drivers/media/video/ir-kbd-i2c.c
@@ -478,13 +478,12 @@ MODULE_AUTHOR("Gerd Knorr, Michal Kochanowicz, Christoph Bartelmus, Ulrich Muell
MODULE_DESCRIPTION("input driver for i2c IR remote controls");
MODULE_LICENSE("GPL");
-static int ir_init(void)
+static int __init ir_init(void)
{
- i2c_add_driver(&driver);
- return 0;
+ return i2c_add_driver(&driver);
}
-static void ir_fini(void)
+static void __exit ir_fini(void)
{
i2c_del_driver(&driver);
}
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index d2070d493..3d560e58b 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1592,13 +1592,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/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index d2070d493..3d560e58b 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1592,13 +1592,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/linux/drivers/media/video/saa6752hs.c b/linux/drivers/media/video/saa6752hs.c
index 80b700d9d..a60588e2d 100644
--- a/linux/drivers/media/video/saa6752hs.c
+++ b/linux/drivers/media/video/saa6752hs.c
@@ -417,13 +417,12 @@ static struct i2c_client client_template =
.driver = &driver,
};
-static int saa6752hs_init_module(void)
+static int __init saa6752hs_init_module(void)
{
- i2c_add_driver(&driver);
- return 0;
+ return i2c_add_driver(&driver);
}
-static void saa6752hs_cleanup_module(void)
+static void __exit saa6752hs_cleanup_module(void)
{
i2c_del_driver(&driver);
}
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index 80b700d9d..a60588e2d 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -417,13 +417,12 @@ static struct i2c_client client_template =
.driver = &driver,
};
-static int saa6752hs_init_module(void)
+static int __init saa6752hs_init_module(void)
{
- i2c_add_driver(&driver);
- return 0;
+ return i2c_add_driver(&driver);
}
-static void saa6752hs_cleanup_module(void)
+static void __exit saa6752hs_cleanup_module(void)
{
i2c_del_driver(&driver);
}
diff --git a/linux/drivers/media/video/tda7432.c b/linux/drivers/media/video/tda7432.c
index 8e921e622..efc1c96a5 100644
--- a/linux/drivers/media/video/tda7432.c
+++ b/linux/drivers/media/video/tda7432.c
@@ -551,17 +551,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/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c
index 52132662a..cbb305b19 100644
--- a/linux/drivers/media/video/tda9875.c
+++ b/linux/drivers/media/video/tda9875.c
@@ -422,13 +422,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/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 7fbf7c8ff..76727b759 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -707,13 +707,12 @@ static struct i2c_client client_template =
.driver = &driver,
};
-static int tda9887_init_module(void)
+static int __init tda9887_init_module(void)
{
- i2c_add_driver(&driver);
- return 0;
+ return i2c_add_driver(&driver);
}
-static void tda9887_cleanup_module(void)
+static void __exit tda9887_cleanup_module(void)
{
i2c_del_driver(&driver);
}
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index bc4b61308..97533e3bc 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -1678,7 +1678,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");
@@ -1686,11 +1686,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/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c
index 3a54674f2..f5917b636 100644
--- a/linux/drivers/media/video/tvmixer.c
+++ b/linux/drivers/media/video/tvmixer.c
@@ -354,17 +354,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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-20 03:18:08 +0000