4 files changed, 18 insertions, 26 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index cf14ca063181..6e1c2f54d9cf 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1461,6 +1461,13 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
         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,
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 1a391486e551..ed3d8f55029b 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -364,17 +364,10 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 
                 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;
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 375ad53f7961..82db555b22dd 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -193,24 +193,13 @@ void cx88_i2c_init_ir(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);
         }
 }
 
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 59a9f3cdc0b5..c8627e453e97 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -294,6 +294,9 @@ i2c_new_probed_device(struct i2c_adapter *adap,
                       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.
  */