From patchwork Tue Jun 8 08:01:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 104897 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o58819R2012166 for ; Tue, 8 Jun 2010 08:01:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752065Ab0FHIBH (ORCPT ); Tue, 8 Jun 2010 04:01:07 -0400 Received: from bamako.nerim.net ([62.4.17.28]:59731 "EHLO bamako.nerim.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751219Ab0FHIBF (ORCPT ); Tue, 8 Jun 2010 04:01:05 -0400 Received: from localhost (localhost [127.0.0.1]) by bamako.nerim.net (Postfix) with ESMTP id 7A22A39DF2C; Tue, 8 Jun 2010 10:01:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at nerim.net Received: from bamako.nerim.net ([127.0.0.1]) by localhost (bamako.nerim.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zxoMG7jtx3Rx; Tue, 8 Jun 2010 10:01:00 +0200 (CEST) Received: from hyperion.delvare (jdelvare.pck.nerim.net [62.212.121.182]) by bamako.nerim.net (Postfix) with ESMTP id 08F8D39DF68; Tue, 8 Jun 2010 10:01:00 +0200 (CEST) Date: Tue, 8 Jun 2010 10:01:00 +0200 From: Jean Delvare To: Linux I2C , LMML Cc: Mauro Carvalho Chehab Subject: [PATCH 2/2] V4L/DVB: Use custom I2C probing function mechanism Message-ID: <20100608100100.35bdae0f@hyperion.delvare> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; i586-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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 08 Jun 2010 08:01:09 +0000 (UTC) --- linux-2.6.35-rc2.orig/drivers/media/video/cx23885/cx23885-i2c.c 2010-06-07 16:12:38.000000000 +0200 +++ linux-2.6.35-rc2/drivers/media/video/cx23885/cx23885-i2c.c 2010-06-08 09:17:06.000000000 +0200 @@ -365,17 +365,10 @@ int cx23885_i2c_register(struct cx23885_ 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 the IR receiver device only - * replies to reads. - */ - if (i2c_smbus_xfer(&bus->i2c_adap, addr_list[0], 0, - I2C_SMBUS_READ, 0, I2C_SMBUS_QUICK, - NULL) >= 0) { - info.addr = addr_list[0]; - i2c_new_device(&bus->i2c_adap, &info); - } + /* Use quick read command for probe, some IR chips don't + * support writes */ + i2c_new_probed_device(&bus->i2c_adap, &info, addr_list, + i2c_probe_func_quick_read); } return bus->i2c_rc; --- linux-2.6.35-rc2.orig/drivers/media/video/cx88/cx88-i2c.c 2010-06-07 16:12:38.000000000 +0200 +++ linux-2.6.35-rc2/drivers/media/video/cx88/cx88-i2c.c 2010-06-08 09:17:06.000000000 +0200 @@ -188,24 +188,13 @@ int cx88_i2c_init(struct cx88_core *core 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; - } - } + /* Use quick read command for probe, some IR chips don't + * support writes */ + i2c_new_probed_device(&core->i2c_adap, &info, addr_list, + i2c_probe_func_quick_read); } return core->i2c_rc; } --- linux-2.6.35-rc2.orig/drivers/i2c/i2c-core.c 2010-06-07 16:12:38.000000000 +0200 +++ linux-2.6.35-rc2/drivers/i2c/i2c-core.c 2010-06-08 09:17:06.000000000 +0200 @@ -1453,6 +1453,13 @@ static int i2c_detect(struct i2c_adapter return err; } +int i2c_probe_func_quick_read(struct i2c_adapter *adap, unsigned short addr) +{ + return i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, 0, + I2C_SMBUS_QUICK, NULL) >= 0; +} +EXPORT_SYMBOL_GPL(i2c_probe_func_quick_read); + struct i2c_client * i2c_new_probed_device(struct i2c_adapter *adap, struct i2c_board_info *info, --- linux-2.6.35-rc2.orig/include/linux/i2c.h 2010-06-07 16:15:10.000000000 +0200 +++ linux-2.6.35-rc2/include/linux/i2c.h 2010-06-08 09:19:07.000000000 +0200 @@ -292,6 +292,9 @@ i2c_new_probed_device(struct i2c_adapter unsigned short const *addr_list, int (*probe)(struct i2c_adapter *, unsigned short addr)); +/* Common custom probe functions */ +extern int i2c_probe_func_quick_read(struct i2c_adapter *, unsigned short addr); + /* For devices that use several addresses, use i2c_new_dummy() to make * client handles for the extra addresses. */