From patchwork Sat Apr 4 12:31:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 16326 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 n34CR2bK010250 for ; Sat, 4 Apr 2009 12:31:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753617AbZDDMbt (ORCPT ); Sat, 4 Apr 2009 08:31:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754379AbZDDMbt (ORCPT ); Sat, 4 Apr 2009 08:31:49 -0400 Received: from zone0.gcu-squad.org ([212.85.147.21]:33951 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753617AbZDDMbs (ORCPT ); Sat, 4 Apr 2009 08:31:48 -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 1Lq678-0000mB-7Y (TLSv1:AES256-SHA:256) (envelope-from ) ; Sat, 04 Apr 2009 15:40:50 +0200 Date: Sat, 4 Apr 2009 14:31:37 +0200 From: Jean Delvare To: LMML Cc: Andy Walls , Hans Verkuil , Mauro Carvalho Chehab , Mike Isely Subject: [PATCH 6/6] saa7134: Simplify handling of IR on AVerMedia Cardbus Message-ID: <20090404143137.46899c20@hyperion.delvare> In-Reply-To: <20090404142427.6e81f316@hyperion.delvare> References: <20090404142427.6e81f316@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 Now that we instantiate I2C IR devices explicitly, we can skip probing altogether on boards where the I2C IR device address is known. The AVerMedia Cardbus are two of these boards. Signed-off-by: Jean Delvare --- linux/drivers/media/video/saa7134/saa7134-input.c | 35 +++------------------ 1 file changed, 5 insertions(+), 30 deletions(-) --- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-04 10:41:44.000000000 +0200 +++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-04 10:47:10.000000000 +0200 @@ -691,22 +691,6 @@ void saa7134_probe_i2c_ir(struct saa7134 I2C_CLIENT_END }; - unsigned char subaddr, data; - struct i2c_msg msg_avermedia[] = { { - .addr = 0x40, - .flags = 0, - .len = 1, - .buf = &subaddr, - }, { - .addr = 0x40, - .flags = I2C_M_RD, - .len = 1, - .buf = &data, - } }; - - struct i2c_client *client; - int rc; - if (disable_ir) { dprintk("IR has been disabled, not probing for i2c remote\n"); return; @@ -753,6 +737,10 @@ void saa7134_probe_i2c_ir(struct saa7134 init_data.get_key = get_key_beholdm6xx; init_data.ir_codes = ir_codes_behold; break; + case SAA7134_BOARD_AVERMEDIA_CARDBUS: + case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: + info.addr = 0x40; + break; } if (init_data.name) @@ -764,20 +752,7 @@ void saa7134_probe_i2c_ir(struct saa7134 } /* Address not known, fallback to probing */ - client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list); - if (client) - return; - - /* Special case for AVerMedia Cardbus remote */ - subaddr = 0x0d; - rc = i2c_transfer(&dev->i2c_adap, msg_avermedia, 2); - dprintk(KERN_DEBUG "probe 0x%02x/0x%02x @ %s: %s\n", - msg_avermedia[0].addr, subaddr, dev->i2c_adap.name, - (2 == rc) ? "yes" : "no"); - if (2 == rc) { - info.addr = msg_avermedia[0].addr; - i2c_new_device(&dev->i2c_adap, &info); - } + i2c_new_probed_device(&dev->i2c_adap, &info, addr_list); } static int saa7134_rc5_irq(struct saa7134_dev *dev)