Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / drivers / media / video / cx88 / cx88-i2c.c

diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 375ad53..f53836b 100644 (file)
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -108,7 +108,7 @@ static const struct i2c_algo_bit_data cx8800_i2c_algo_template = {
 
 /* ----------------------------------------------------------------------- */
 
-static char *i2c_devs[128] = {
+static const char * const i2c_devs[128] = {
        [ 0x1c >> 1 ] = "lgdt330x",
        [ 0x86 >> 1 ] = "tda9887/cx22702",
        [ 0xa0 >> 1 ] = "eeprom",
@@ -117,7 +117,7 @@ static char *i2c_devs[128] = {
        [ 0xc8 >> 1 ] = "xc5000",
 };
 
-static void do_i2c_scan(char *name, struct i2c_client *c)
+static void do_i2c_scan(const char *name, struct i2c_client *c)
 {
        unsigned char buf;
        int i,rc;
@@ -183,41 +183,3 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
 
        return core->i2c_rc;
 }
-
-void cx88_i2c_init_ir(struct cx88_core *core)
-{
-       /* Instantiate the IR receiver device, if present */
-       if (0 == core->i2c_rc) {
-               struct i2c_board_info info;
-               const unsigned short addr_list[] = {
-                       0x18, 0x6b, 0x71,
-                       I2C_CLIENT_END
-               };
-               const unsigned short *addrp;
-
-               memset(&info, 0, sizeof(struct i2c_board_info));
-               strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-               /*
-                * We can't call i2c_new_probed_device() because it uses
-                * quick writes for probing and at least some R receiver
-                * devices only reply to reads.
-                */
-               for (addrp = addr_list; *addrp != I2C_CLIENT_END; addrp++) {
-                       if (i2c_smbus_xfer(&core->i2c_adap, *addrp, 0,
-                                          I2C_SMBUS_READ, 0,
-                                          I2C_SMBUS_QUICK, NULL) >= 0) {
-                               info.addr = *addrp;
-                               i2c_new_device(&core->i2c_adap, &info);
-                               break;
-                       }
-               }
-       }
-}
-
-/* ----------------------------------------------------------------------- */
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */