V4L/DVB (11843): ir-kbd-i2c: Don't use i2c_client.name for our own needs

In the standard device driver binding model, the name field of
struct i2c_client is used to match devices to their drivers, so we
must stop using it for internal purposes. Define a separate field
in struct IR_i2c as a replacement, and use it.

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

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 3958f168fc57..b2aed29e2d74 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1384,13 +1384,13 @@ struct em28xx_board em28xx_boards[] = {
                         .type     = EM28XX_VMUX_COMPOSITE1,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AUDIO_SRC_LINE,
-                        .gpio     = terratec_av350_unmute_gpio,
+                        .gpio     = terratec_av350_unmute_gpio,
 
                 }, {
                         .type     = EM28XX_VMUX_SVIDEO,
                         .vmux     = TVP5150_SVIDEO,
                         .amux     = EM28XX_AUDIO_SRC_LINE,
-                        .gpio     = terratec_av350_unmute_gpio,
+                        .gpio     = terratec_av350_unmute_gpio,
                 } },
         },
 };
@@ -1929,19 +1929,19 @@ void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
         case (EM2820_BOARD_TERRATEC_CINERGY_250):
                 ir->ir_codes = ir_codes_em_terratec;
                 ir->get_key = em28xx_get_key_terratec;
-                snprintf(ir->c.name, sizeof(ir->c.name),
+                snprintf(ir->name, sizeof(ir->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->c.name, sizeof(ir->c.name),
+                snprintf(ir->name, sizeof(ir->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->c.name, sizeof(ir->c.name),
+                snprintf(ir->name, sizeof(ir->name),
                          "i2c IR (EM2840 Hauppauge)");
                 break;
         case (EM2820_BOARD_MSI_VOX_USB_2):
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index a5abfd7a19f5..7450ba7dee83 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -40,7 +40,7 @@ MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
 
 #define i2cdprintk(fmt, arg...) \
         if (ir_debug) { \
-                printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg); \
+                printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
         }
 
 #define dprintk(fmt, arg...) \