Hi,
the patch below simplifies the videotext drivers saa5246a and saa5249 by using the
I2C_CLIENT_INSMOD macro.
Thanks to Kai Volkmar.
Michael
Signed-off-by: Michael Geng <[email protected]>
Common subdirectories: linux-2.6.11/drivers/media/video/cx88 and linux/drivers/media/video/cx88
Common subdirectories: linux-2.6.11/drivers/media/video/ovcamchip and linux/drivers/media/video/ovcamchip
diff -u linux-2.6.11/drivers/media/video/saa5246a.c linux/drivers/media/video/saa5246a.c
--- linux-2.6.11/drivers/media/video/saa5246a.c Wed Mar 2 08:38:08 2005
+++ linux/drivers/media/video/saa5246a.c Sun Mar 6 17:00:35 2005
@@ -65,18 +65,7 @@
/* Addresses to scan */
static unsigned short normal_i2c[] = { I2C_ADDRESS, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-
-static struct i2c_client_address_data addr_data = {
- normal_i2c, normal_i2c_range,
- probe, probe_range,
- ignore, ignore_range,
- force
-};
+I2C_CLIENT_INSMOD;
static struct i2c_client client_template;
diff -u linux-2.6.11/drivers/media/video/saa5249.c linux/drivers/media/video/saa5249.c
--- linux-2.6.11/drivers/media/video/saa5249.c Wed Mar 2 08:38:17 2005
+++ linux/drivers/media/video/saa5249.c Sun Mar 6 17:01:35 2005
@@ -133,18 +133,7 @@
/* Addresses to scan */
static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-
-static struct i2c_client_address_data addr_data = {
- normal_i2c, normal_i2c_range,
- probe, probe_range,
- ignore, ignore_range,
- force
-};
+I2C_CLIENT_INSMOD;
static struct i2c_client client_template;
Common subdirectories: linux-2.6.11/drivers/media/video/saa7134 and linux/drivers/media/video/saa7134