From patchwork Fri Apr 17 20:30:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 18739 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3HKUelx022412 for ; Fri, 17 Apr 2009 20:30:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753967AbZDQUaj (ORCPT ); Fri, 17 Apr 2009 16:30:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753734AbZDQUaj (ORCPT ); Fri, 17 Apr 2009 16:30:39 -0400 Received: from zone0.gcu-squad.org ([212.85.147.21]:24333 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752470AbZDQUaj (ORCPT ); Fri, 17 Apr 2009 16:30:39 -0400 Received: from jdelvare.pck.nerim.net ([62.212.121.182] helo=hyperion.delvare) by services.gcu-squad.org (GCU Mailer Daemon) with esmtpsa id 1Luvn5-0004rN-3R (TLSv1:AES256-SHA:256) (envelope-from ) for linux-media@vger.kernel.org; Fri, 17 Apr 2009 23:40:07 +0200 Date: Fri, 17 Apr 2009 22:30:32 +0200 From: Jean Delvare To: LMML Subject: [PATCH 1/6] ir-kbd-i2c: Don't use i2c_client.name for our own needs Message-ID: <20090417223032.4671a22d@hyperion.delvare> In-Reply-To: <20090417222927.7a966350@hyperion.delvare> References: <20090417222927.7a966350@hyperion.delvare> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; x86_64-suse-linux-gnu) Mime-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- linux/drivers/media/video/cx231xx/cx231xx-input.c | 2 +- linux/drivers/media/video/em28xx/em28xx-cards.c | 6 +++--- linux/drivers/media/video/em28xx/em28xx-input.c | 2 +- linux/drivers/media/video/ir-kbd-i2c.c | 5 +++-- linux/drivers/media/video/saa7134/saa7134-input.c | 12 ++++++------ linux/include/media/ir-kbd-i2c.h | 1 + 6 files changed, 15 insertions(+), 13 deletions(-) --- v4l-dvb.orig/linux/drivers/media/video/cx231xx/cx231xx-input.c 2009-04-08 11:27:31.000000000 +0200 +++ v4l-dvb/linux/drivers/media/video/cx231xx/cx231xx-input.c 2009-04-17 12:54:18.000000000 +0200 @@ -37,7 +37,7 @@ MODULE_PARM_DESC(ir_debug, "enable debug #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...) \ --- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-cards.c 2009-04-17 11:22:56.000000000 +0200 +++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-cards.c 2009-04-17 12:54:18.000000000 +0200 @@ -1948,19 +1948,19 @@ void em28xx_set_ir(struct em28xx *dev, s 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): --- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-input.c 2009-04-08 11:27:31.000000000 +0200 +++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-input.c 2009-04-17 12:54:18.000000000 +0200 @@ -41,7 +41,7 @@ MODULE_PARM_DESC(ir_debug, "enable debug #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...) \ --- v4l-dvb.orig/linux/drivers/media/video/ir-kbd-i2c.c 2009-04-08 11:27:31.000000000 +0200 +++ v4l-dvb/linux/drivers/media/video/ir-kbd-i2c.c 2009-04-17 12:54:18.000000000 +0200 @@ -346,6 +346,7 @@ static int ir_attach(struct i2c_adapter ir->c.adapter = adap; ir->c.addr = addr; + snprintf(ir->c.name, sizeof(ir->c.name), "ir-kbd"); i2c_set_clientdata(&ir->c, ir); @@ -419,7 +420,7 @@ static int ir_attach(struct i2c_adapter } /* Sets name */ - snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (%s)", name); + snprintf(ir->name, sizeof(ir->name), "i2c IR (%s)", name); ir->ir_codes = ir_codes; /* register i2c device @@ -444,7 +445,7 @@ static int ir_attach(struct i2c_adapter /* init + register input device */ ir_input_init(input_dev, &ir->ir, ir_type, ir->ir_codes); input_dev->id.bustype = BUS_I2C; - input_dev->name = ir->c.name; + input_dev->name = ir->name; input_dev->phys = ir->phys; err = input_register_device(ir->input); --- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-17 11:22:56.000000000 +0200 +++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-17 12:54:18.000000000 +0200 @@ -60,7 +60,7 @@ MODULE_PARM_DESC(disable_other_ir, "disa #define dprintk(fmt, arg...) if (ir_debug) \ printk(KERN_DEBUG "%s/ir: " fmt, dev->name , ## arg) #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) /* Helper functions for RC5 and NEC decoding at GPIO16 or GPIO18 */ static int saa7134_rc5_irq(struct saa7134_dev *dev); @@ -694,7 +694,7 @@ void saa7134_set_i2c_ir(struct saa7134_d switch (dev->board) { case SAA7134_BOARD_PINNACLE_PCTV_110i: case SAA7134_BOARD_PINNACLE_PCTV_310i: - snprintf(ir->c.name, sizeof(ir->c.name), "Pinnacle PCTV"); + snprintf(ir->name, sizeof(ir->name), "Pinnacle PCTV"); if (pinnacle_remote == 0) { ir->get_key = get_key_pinnacle_color; ir->ir_codes = ir_codes_pinnacle_color; @@ -704,17 +704,17 @@ void saa7134_set_i2c_ir(struct saa7134_d } break; case SAA7134_BOARD_UPMOST_PURPLE_TV: - snprintf(ir->c.name, sizeof(ir->c.name), "Purple TV"); + snprintf(ir->name, sizeof(ir->name), "Purple TV"); ir->get_key = get_key_purpletv; ir->ir_codes = ir_codes_purpletv; break; case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS: - snprintf(ir->c.name, sizeof(ir->c.name), "MSI TV@nywhere Plus"); + snprintf(ir->name, sizeof(ir->name), "MSI TV@nywhere Plus"); ir->get_key = get_key_msi_tvanywhere_plus; ir->ir_codes = ir_codes_msi_tvanywhere_plus; break; case SAA7134_BOARD_HAUPPAUGE_HVR1110: - snprintf(ir->c.name, sizeof(ir->c.name), "HVR 1110"); + snprintf(ir->name, sizeof(ir->name), "HVR 1110"); ir->get_key = get_key_hvr1110; ir->ir_codes = ir_codes_hauppauge_new; break; @@ -723,7 +723,7 @@ void saa7134_set_i2c_ir(struct saa7134_d case SAA7134_BOARD_BEHOLD_M63: case SAA7134_BOARD_BEHOLD_M6_EXTRA: case SAA7134_BOARD_BEHOLD_H6: - snprintf(ir->c.name, sizeof(ir->c.name), "BeholdTV"); + snprintf(ir->name, sizeof(ir->name), "BeholdTV"); ir->get_key = get_key_beholdm6xx; ir->ir_codes = ir_codes_behold; break; --- v4l-dvb.orig/linux/include/media/ir-kbd-i2c.h 2009-04-08 11:27:31.000000000 +0200 +++ v4l-dvb/linux/include/media/ir-kbd-i2c.h 2009-04-17 12:54:18.000000000 +0200 @@ -15,6 +15,7 @@ struct IR_i2c { unsigned char old; struct delayed_work work; + char name[32]; char phys[32]; int (*get_key)(struct IR_i2c*, u32*, u32*); };