V4L/DVB (11845): ir-kbd-i2c: Use initialization data

For specific boards, pass initialization data to ir-kbd-i2c instead
of modifying the settings after the device is initialized. This is
more efficient and easier to read.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 15 insertions, 39 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index edba71115a94..fe2a471e5f64 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1915,6 +1915,7 @@ static int em28xx_hint_board(struct em28xx *dev)
 void em28xx_register_i2c_ir(struct em28xx *dev)
 {
         struct i2c_board_info info;
+        struct IR_i2c_init_data init_data;
         const unsigned short addr_list[] = {
                  0x30, 0x47, I2C_CLIENT_END
         };
@@ -1923,12 +1924,9 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
                 return;
 
         memset(&info, 0, sizeof(struct i2c_board_info));
+        memset(&init_data, 0, sizeof(struct IR_i2c_init_data));
         strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-        i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
-}
 
-void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
-{
         /* detect & configure */
         switch (dev->model) {
         case (EM2800_BOARD_UNKNOWN):
@@ -1937,22 +1935,19 @@ void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
                 break;
         case (EM2800_BOARD_TERRATEC_CINERGY_200):
         case (EM2820_BOARD_TERRATEC_CINERGY_250):
-                ir->ir_codes = ir_codes_em_terratec;
-                ir->get_key = em28xx_get_key_terratec;
-                snprintf(ir->name, sizeof(ir->name),
-                         "i2c IR (EM28XX Terratec)");
+                init_data.ir_codes = ir_codes_em_terratec;
+                init_data.get_key = em28xx_get_key_terratec;
+                init_data.name = "i2c IR (EM28XX Terratec)";
                 break;
         case (EM2820_BOARD_PINNACLE_USB_2):
-                ir->ir_codes = ir_codes_pinnacle_grey;
-                ir->get_key = em28xx_get_key_pinnacle_usb_grey;
-                snprintf(ir->name, sizeof(ir->name),
-                         "i2c IR (EM28XX Pinnacle PCTV)");
+                init_data.ir_codes = ir_codes_pinnacle_grey;
+                init_data.get_key = em28xx_get_key_pinnacle_usb_grey;
+                init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
                 break;
         case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
-                ir->ir_codes = ir_codes_hauppauge_new;
-                ir->get_key = em28xx_get_key_em_haup;
-                snprintf(ir->name, sizeof(ir->name),
-                         "i2c IR (EM2840 Hauppauge)");
+                init_data.ir_codes = ir_codes_hauppauge_new;
+                init_data.get_key = em28xx_get_key_em_haup;
+                init_data.name = "i2c IR (EM2840 Hauppauge)";
                 break;
         case (EM2820_BOARD_MSI_VOX_USB_2):
                 break;
@@ -1963,6 +1958,10 @@ void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
         case (EM2800_BOARD_GRABBEEX_USB2800):
                 break;
         }
+
+        if (init_data.name)
+                info.platform_data = &init_data;
+        i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
 }
 
 void em28xx_card_setup(struct em28xx *dev)
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index d90294cbb70d..2c86fcf089f5 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -451,27 +451,6 @@ static u32 functionality(struct i2c_adapter *adap)
         return I2C_FUNC_SMBUS_EMUL;
 }
 
-/*
- * attach_inform()
- * gets called when a device attaches to the i2c bus
- * does some basic configuration
- */
-static int attach_inform(struct i2c_client *client)
-{
-        struct em28xx *dev = client->adapter->algo_data;
-        struct IR_i2c *ir = i2c_get_clientdata(client);
-
-        switch (client->addr << 1) {
-        case 0x60:
-        case 0x8e:
-                dprintk1(1, "attach_inform: IR detected (%s).\n", ir->phys);
-                em28xx_set_ir(dev, ir);
-                break;
-        }
-
-        return 0;
-}
-
 static struct i2c_algorithm em28xx_algo = {
         .master_xfer   = em28xx_i2c_xfer,
         .functionality = functionality,
@@ -482,7 +461,6 @@ static struct i2c_adapter em28xx_adap_template = {
         .name = "em28xx",
         .id = I2C_HW_B_EM28XX,
         .algo = &em28xx_algo,
-        .client_register = attach_inform,
 };
 
 static struct i2c_client em28xx_client_template = {
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 9c632541df10..8db797fedb7e 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -644,7 +644,6 @@ extern struct em28xx_board em28xx_boards[];
 extern struct usb_device_id em28xx_id_table[];
 extern const unsigned int em28xx_bcount;
 void em28xx_register_i2c_ir(struct em28xx *dev);
-void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir);
 int em28xx_tuner_callback(void *ptr, int component, int command, int arg);
 void em28xx_release_resources(struct em28xx *dev);