V4L/DVB (3569): PATCH: switch cpia2 to mutexes and use ioctl 32 compat lib func

[linux-2.6] / drivers / media / video / tvaudio.c

diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 4efb01bb44ac1cdce5212c69caa745116c3a7a73..4cc0497dcbde6aa65b548336186b5d14bf5cb729 100644 (file)
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -33,7 +33,7 @@
 #include <media/audiochip.h>
 #include <media/v4l2-common.h>
 
-#include "tvaudio.h"
+#include <media/i2c-addr.h>
 
 /* ---------------------------------------------------------------------- */
 /* insmod args                                                            */
@@ -137,14 +137,14 @@ struct CHIPSTATE {
 /* i2c addresses                                                          */
 
 static unsigned short normal_i2c[] = {
-       I2C_TDA8425   >> 1,
-       I2C_TEA6300   >> 1,
-       I2C_TEA6420   >> 1,
-       I2C_TDA9840   >> 1,
-       I2C_TDA985x_L >> 1,
-       I2C_TDA985x_H >> 1,
-       I2C_TDA9874   >> 1,
-       I2C_PIC16C54  >> 1,
+       I2C_ADDR_TDA8425   >> 1,
+       I2C_ADDR_TEA6300   >> 1,
+       I2C_ADDR_TEA6420   >> 1,
+       I2C_ADDR_TDA9840   >> 1,
+       I2C_ADDR_TDA985x_L >> 1,
+       I2C_ADDR_TDA985x_H >> 1,
+       I2C_ADDR_TDA9874   >> 1,
+       I2C_ADDR_PIC16C54  >> 1,
        I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
@@ -1269,8 +1269,8 @@ static struct CHIPDESC chiplist[] = {
                .name       = "tda9840",
                .id         = I2C_DRIVERID_TDA9840,
                .insmodopt  = &tda9840,
-               .addr_lo    = I2C_TDA9840 >> 1,
-               .addr_hi    = I2C_TDA9840 >> 1,
+               .addr_lo    = I2C_ADDR_TDA9840 >> 1,
+               .addr_hi    = I2C_ADDR_TDA9840 >> 1,
                .registers  = 5,
 
                .checkit    = tda9840_checkit,
@@ -1286,8 +1286,8 @@ static struct CHIPDESC chiplist[] = {
                .id         = I2C_DRIVERID_TDA9873,
                .checkit    = tda9873_checkit,
                .insmodopt  = &tda9873,
-               .addr_lo    = I2C_TDA985x_L >> 1,
-               .addr_hi    = I2C_TDA985x_H >> 1,
+               .addr_lo    = I2C_ADDR_TDA985x_L >> 1,
+               .addr_hi    = I2C_ADDR_TDA985x_H >> 1,
                .registers  = 3,
                .flags      = CHIP_HAS_INPUTSEL,
 
@@ -1308,8 +1308,8 @@ static struct CHIPDESC chiplist[] = {
                .checkit    = tda9874a_checkit,
                .initialize = tda9874a_initialize,
                .insmodopt  = &tda9874a,
-               .addr_lo    = I2C_TDA9874 >> 1,
-               .addr_hi    = I2C_TDA9874 >> 1,
+               .addr_lo    = I2C_ADDR_TDA9874 >> 1,
+               .addr_hi    = I2C_ADDR_TDA9874 >> 1,
 
                .getmode    = tda9874a_getmode,
                .setmode    = tda9874a_setmode,
@@ -1319,8 +1319,8 @@ static struct CHIPDESC chiplist[] = {
                .name       = "tda9850",
                .id         = I2C_DRIVERID_TDA9850,
                .insmodopt  = &tda9850,
-               .addr_lo    = I2C_TDA985x_L >> 1,
-               .addr_hi    = I2C_TDA985x_H >> 1,
+               .addr_lo    = I2C_ADDR_TDA985x_L >> 1,
+               .addr_hi    = I2C_ADDR_TDA985x_H >> 1,
                .registers  = 11,
 
                .getmode    = tda985x_getmode,
@@ -1332,8 +1332,8 @@ static struct CHIPDESC chiplist[] = {
                .name       = "tda9855",
                .id         = I2C_DRIVERID_TDA9855,
                .insmodopt  = &tda9855,
-               .addr_lo    = I2C_TDA985x_L >> 1,
-               .addr_hi    = I2C_TDA985x_H >> 1,
+               .addr_lo    = I2C_ADDR_TDA985x_L >> 1,
+               .addr_hi    = I2C_ADDR_TDA985x_H >> 1,
                .registers  = 11,
                .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE,
 
@@ -1357,8 +1357,8 @@ static struct CHIPDESC chiplist[] = {
                .name       = "tea6300",
                .id         = I2C_DRIVERID_TEA6300,
                .insmodopt  = &tea6300,
-               .addr_lo    = I2C_TEA6300 >> 1,
-               .addr_hi    = I2C_TEA6300 >> 1,
+               .addr_lo    = I2C_ADDR_TEA6300 >> 1,
+               .addr_hi    = I2C_ADDR_TEA6300 >> 1,
                .registers  = 6,
                .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
 
@@ -1379,8 +1379,8 @@ static struct CHIPDESC chiplist[] = {
                .id         = I2C_DRIVERID_TEA6300,
                .initialize = tea6320_initialize,
                .insmodopt  = &tea6320,
-               .addr_lo    = I2C_TEA6300 >> 1,
-               .addr_hi    = I2C_TEA6300 >> 1,
+               .addr_lo    = I2C_ADDR_TEA6300 >> 1,
+               .addr_hi    = I2C_ADDR_TEA6300 >> 1,
                .registers  = 8,
                .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
 
@@ -1400,8 +1400,8 @@ static struct CHIPDESC chiplist[] = {
                .name       = "tea6420",
                .id         = I2C_DRIVERID_TEA6420,
                .insmodopt  = &tea6420,
-               .addr_lo    = I2C_TEA6420 >> 1,
-               .addr_hi    = I2C_TEA6420 >> 1,
+               .addr_lo    = I2C_ADDR_TEA6420 >> 1,
+               .addr_hi    = I2C_ADDR_TEA6420 >> 1,
                .registers  = 1,
                .flags      = CHIP_HAS_INPUTSEL,
 
@@ -1413,8 +1413,8 @@ static struct CHIPDESC chiplist[] = {
                .name       = "tda8425",
                .id         = I2C_DRIVERID_TDA8425,
                .insmodopt  = &tda8425,
-               .addr_lo    = I2C_TDA8425 >> 1,
-               .addr_hi    = I2C_TDA8425 >> 1,
+               .addr_lo    = I2C_ADDR_TDA8425 >> 1,
+               .addr_hi    = I2C_ADDR_TDA8425 >> 1,
                .registers  = 9,
                .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
 
@@ -1437,8 +1437,8 @@ static struct CHIPDESC chiplist[] = {
                .name       = "pic16c54 (PV951)",
                .id         = I2C_DRIVERID_PIC16C54_PV9,
                .insmodopt  = &pic16c54,
-               .addr_lo    = I2C_PIC16C54 >> 1,
-               .addr_hi    = I2C_PIC16C54>> 1,
+               .addr_lo    = I2C_ADDR_PIC16C54 >> 1,
+               .addr_hi    = I2C_ADDR_PIC16C54>> 1,
                .registers  = 2,
                .flags      = CHIP_HAS_INPUTSEL,
 
@@ -1456,8 +1456,8 @@ static struct CHIPDESC chiplist[] = {
                /*.id         = I2C_DRIVERID_TA8874Z, */
                .checkit    = ta8874z_checkit,
                .insmodopt  = &ta8874z,
-               .addr_lo    = I2C_TDA9840 >> 1,
-               .addr_hi    = I2C_TDA9840 >> 1,
+               .addr_lo    = I2C_ADDR_TDA9840 >> 1,
+               .addr_hi    = I2C_ADDR_TDA9840 >> 1,
                .registers  = 2,
 
                .getmode    = ta8874z_getmode,