[PATCH] v4l: 885: second round of i2c ids redefinition cleanup

- Second round of i2c IDs redefinition cleanup.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 3e42493a4e0a7bb8c24e24e03634f88f92a4f303..e4063950ae57d7782ac7ce8d6d71f862acf55372 100644 (file)
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 
 #include <media/audiochip.h>
-#include <media/id.h>
 #include "bttv.h"
 #include "bt832.h"
 

diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index ba2c95842fbaa4d94d8c862eb19a2f81de9470ee..d603229c9f2f9ccd4689872bba477572e4d92e4a 100644 (file)
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -54,7 +54,6 @@
 #include <asm/pgtable.h>
 
 #include <media/audiochip.h>
-#include <media/id.h>
 #include "msp3400.h"
 
 #define OPMODE_AUTO    -1

diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 5252a4ca3fd198f9112cce7ed2948ba478e2fe74..23ea548a71e0e826acf2814907efcedefa7472e7 100644 (file)
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -31,7 +31,6 @@
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 
-#include <media/id.h>
 
 #include "rds.h"
 

diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 2bf5cf79eec148e6ac928adb64b83d99935308b8..cdd1ed9c80658d358ebcad24de73fdb79112b0c4 100644 (file)
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/crc32.h>
 
-#include <media/id.h>
 
 #define MPEG_VIDEO_TARGET_BITRATE_MAX  27000
 #define MPEG_VIDEO_MAX_BITRATE_MAX     27000

diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 1365f1f32feeec48c4f31fc82fc9c1fc5554f5d9..4273ded9d174ca1f27a81c764e1aae1c64548bdb 100644 (file)
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -34,7 +34,6 @@
 
 #include <media/tuner.h>
 #include <media/audiochip.h>
-#include <media/id.h>
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
 #include <media/video-buf.h>

diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 14cf1d357c3b22899e36f47a3b011ffcfe936130..d32737dd21427d8bfed38d1206fc11b5dd272622 100644 (file)
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -50,7 +50,6 @@
 
 #include "bttv.h"
 #include <media/audiochip.h>
-#include <media/id.h>
 
 #ifndef VIDEO_AUDIO_BALANCE
 # define VIDEO_AUDIO_BALANCE 32

diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 5a9faefc36401dd88d2b9c01c405ff10ee5e0e6c..a5e37dc91f39054e1bdfff22350583540157d2de 100644 (file)
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -32,7 +32,6 @@
 
 #include "bttv.h"
 #include <media/audiochip.h>
-#include <media/id.h>
 
 static int debug; /* insmod parameter */
 module_param(debug, int, S_IRUGO | S_IWUSR);

diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 9d6b6f57abcde21e6e1bf34c53cabe065b7b49ea..4249127c0a1d67c3b144f63f31888caa0609ed05 100644 (file)
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -11,7 +11,6 @@
 
 #include <media/audiochip.h>
 #include <media/tuner.h>
-#include <media/id.h>
 
 /* Chips:
    TDA9885 (PAL, NTSC)

diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 75901b03073018a1d330c9c32dd49f0eb020cdd5..c31bf28b73fe707bb4154639545cc24731a3aa15 100644 (file)
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -31,7 +31,6 @@
 #include <linux/smp_lock.h>
 
 #include <media/audiochip.h>
-#include <media/id.h>
 
 #include "tvaudio.h"
 
@@ -1438,7 +1437,7 @@ static struct CHIPDESC chiplist[] = {
        },
        {
                .name       = "pic16c54 (PV951)",
-               .id         = I2C_DRIVERID_PIC16C54_PV951,
+               .id         = I2C_DRIVERID_PIC16C54_PV9,
                .insmodopt  = &pic16c54,
                .addr_lo    = I2C_PIC16C54 >> 1,
                .addr_hi    = I2C_PIC16C54>> 1,

diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d83a3361811939c6c6b24ae20ede40c57d8da373..72e8741e8b595e2d4817b056ff1c87c21ab7c158 100644 (file)
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -658,10 +658,6 @@ EXPORT_SYMBOL(tveeprom_read);
 /* run, just call the exported tveeprom_* directly, there is no point in   */
 /* using the indirect way via i2c_driver->command()                        */
 
-#ifndef I2C_DRIVERID_TVEEPROM
-# define I2C_DRIVERID_TVEEPROM I2C_DRIVERID_EXP2
-#endif
-
 static unsigned short normal_i2c[] = {
        0xa0 >> 1,
        I2C_CLIENT_END,

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 1ce4b54caa211d4f89ac87cad60f501a5c4e0fd7..815675f1e34990467ea49214a42b86f73be98a0e 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -27,10 +27,10 @@
  * ---- Driver types -----------------------------------------------------
  *       device id name + number        function description, i2c address(es)
  *
- *  Range 1000-1999 range is defined in sensors/sensors.h 
- *  Range 0x100 - 0x1ff is for V4L2 Common Components 
+ *  Range 1000-1999 range is defined in sensors/sensors.h
+ *  Range 0x100 - 0x1ff is for V4L2 Common Components
  *  Range 0xf000 - 0xffff is reserved for local experimentation, and should
- *        never be used in official drivers 
+ *        never be used in official drivers
  */
 
 #define I2C_DRIVERID_MSP3400    1
@@ -99,6 +99,9 @@
 #define I2C_DRIVERID_MAX6900   63      /* MAX6900 real-time clock      */
 #define I2C_DRIVERID_SAA7114H  64      /* video decoder                */
 #define I2C_DRIVERID_DS1374    65      /* DS1374 real time clock       */
+#define I2C_DRIVERID_TDA9874   66      /* TV sound decoder             */
+#define I2C_DRIVERID_SAA6752HS 67      /* MPEG2 encoder                */
+#define I2C_DRIVERID_TVEEPROM  68      /* TV EEPROM                    */
 
 
 #define I2C_DRIVERID_EXP0      0xF0    /* experimental use id's        */
@@ -111,7 +114,7 @@
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
 #define I2C_DRIVERID_ALERT      903    /* SMBus Alert Responder Client  */
 
-/* IDs --   Use DRIVERIDs 1000-1999 for sensors. 
+/* IDs --   Use DRIVERIDs 1000-1999 for sensors.
    These were originally in sensors.h in the lm_sensors package */
 #define I2C_DRIVERID_LM78 1002
 #define I2C_DRIVERID_LM75 1003