Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d44f19d5 authored by Jean Delvare's avatar Jean Delvare
Browse files

V4L/DVB: Use custom I2C probing function mechanism 



Now that i2c-core offers the possibility to provide custom probing
function for I2C devices, let's make use of it.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9a94241a

drivers/i2c/i2c-core.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -1461,6 +1461,13 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) 
	return err;

	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 *

struct i2c_client *

i2c_new_probed_device(struct i2c_adapter *adap,

i2c_new_probed_device(struct i2c_adapter *adap,

		      struct i2c_board_info *info,

		      struct i2c_board_info *info,

drivers/media/video/cx23885/cx23885-i2c.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -364,17 +364,10 @@ int cx23885_i2c_register(struct cx23885_i2c *bus) 




		memset(&info, 0, sizeof(struct i2c_board_info));

		memset(&info, 0, sizeof(struct i2c_board_info));

		strlcpy(info.type, "ir_video", I2C_NAME_SIZE);

		strlcpy(info.type, "ir_video", I2C_NAME_SIZE);

		/*

		/* Use quick read command for probe, some IR chips don't

		 * We can't call i2c_new_probed_device() because it uses

		 * support writes */

		 * quick writes for probing and the IR receiver device only

		i2c_new_probed_device(&bus->i2c_adap, &info, addr_list,

		 * replies to reads.

				      i2c_probe_func_quick_read);

		 */

		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);

		}

	}

	}





	return bus->i2c_rc;

	return bus->i2c_rc;

drivers/media/video/cx88/cx88-i2c.c

+4 −15
Original line number Original line Diff line number Diff line
@@ -193,24 +193,13 @@ void cx88_i2c_init_ir(struct cx88_core *core) 
			0x18, 0x6b, 0x71,

			0x18, 0x6b, 0x71,

			I2C_CLIENT_END

			I2C_CLIENT_END

		};

		};

		const unsigned short *addrp;





		memset(&info, 0, sizeof(struct i2c_board_info));

		memset(&info, 0, sizeof(struct i2c_board_info));

		strlcpy(info.type, "ir_video", I2C_NAME_SIZE);

		strlcpy(info.type, "ir_video", I2C_NAME_SIZE);

		/*

		/* Use quick read command for probe, some IR chips don't

		 * We can't call i2c_new_probed_device() because it uses

		 * support writes */

		 * quick writes for probing and at least some R receiver

		i2c_new_probed_device(&core->i2c_adap, &info, addr_list,

		 * devices only reply to reads.

				      i2c_probe_func_quick_read);

		 */

		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;

			}

		}

	}

	}

}

}

include/linux/i2c.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -294,6 +294,9 @@ i2c_new_probed_device(struct i2c_adapter *adap, 
		      unsigned short const *addr_list,

		      unsigned short const *addr_list,

		      int (*probe)(struct i2c_adapter *, unsigned short addr));

		      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

/* For devices that use several addresses, use i2c_new_dummy() to make

 * client handles for the extra addresses.

 * client handles for the extra addresses.

 */

 */