On Friday 15 May 2009 19:20:10 Guennadi Liakhovetski wrote:
> Introduce a function similar to v4l2_i2c_new_subdev() but taking a
> pointer to a struct i2c_board_info as a parameter instead of a client
> type and an I2C address, and make v4l2_i2c_new_subdev() a wrapper around
> it.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
> ---
>
> Hans, renamed as you requested and updated to a (more) current state.
NAK. Not because it is a bad idea, but because you need to patch against the
version in the v4l-dvb repo. The version in the kernel is missing a lot of
the compatibility code which we unfortunately need to keep.
Any function passing the board_info will be valid for kernels >= 2.6.26
only.
I've been thinking of an alternative that is more 'compatibility' friendly:
The board info contains two fields that are really of interest: irq and the
platform data. The core ops can be extended with a new .s_config function
that receives the irq and a platform data pointer. If the new
v4l2_i2c_subdev_board function is called, then .s_config is called
automatically with the right parameters. This makes it possible to use
v4l2_i2c_subdev_board with a i2c subdev that has to be backwards compatible
(and so cannot rely on board_info). Instead that subdev will receive an
s_config call with the needed info.
And v4l drivers that have to be backwards compatible and so cannot use
v4l2_i2c_subdev_board can call s_config directly.
I agree, it is not elegant, but it is a fact of life that we need to stay
backwards compatible. This new i2c API is only usable from 2.6.26 onwards,
and that's simply too recent.
In my opinion doing it the way I proposed above will be a reasonable
alternative that is also easy to remove when at some point in the future we
stop supporting pre-2.6.26 kernels.
Regards,
Hans
>
> drivers/media/video/v4l2-common.c | 30 +++++++++++++++++++-----------
> include/media/v4l2-common.h | 5 +++++
> 2 files changed, 24 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/media/video/v4l2-common.c
> b/drivers/media/video/v4l2-common.c index f576ef6..ab190aa 100644
> --- a/drivers/media/video/v4l2-common.c
> +++ b/drivers/media/video/v4l2-common.c
> @@ -758,30 +758,38 @@ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd,
> struct i2c_client *client, }
> EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init);
>
> -
> -
> /* Load an i2c sub-device. */
> struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
> struct i2c_adapter *adapter,
> const char *module_name, const char *client_type, u8 addr)
> {
> - struct v4l2_subdev *sd = NULL;
> - struct i2c_client *client;
> struct i2c_board_info info;
>
> - BUG_ON(!v4l2_dev);
> -
> - if (module_name)
> - request_module(module_name);
> -
> /* Setup the i2c board info with the device type and
> the device address. */
> memset(&info, 0, sizeof(info));
> strlcpy(info.type, client_type, sizeof(info.type));
> info.addr = addr;
>
> + return v4l2_i2c_subdev_board(v4l2_dev, adapter, module_name, &info);
> +}
> +EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
> +
> +/* Load an i2c sub-device using provided struct i2c_board_info. */
> +struct v4l2_subdev *v4l2_i2c_subdev_board(struct v4l2_device *v4l2_dev,
> + struct i2c_adapter *adapter,
> + const char *module_name, const struct i2c_board_info *info)
> +{
> + struct v4l2_subdev *sd = NULL;
> + struct i2c_client *client;
> +
> + BUG_ON(!v4l2_dev);
> +
> + if (module_name)
> + request_module(module_name);
> +
> /* Create the i2c client */
> - client = i2c_new_device(adapter, &info);
> + client = i2c_new_device(adapter, info);
> /* Note: it is possible in the future that
> c->driver is NULL if the driver is still being loaded.
> We need better support from the kernel so that we
> @@ -808,7 +816,7 @@ error:
> i2c_unregister_device(client);
> return sd;
> }
> -EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
> +EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_board);
>
> /* Probe and load an i2c sub-device. */
> struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device
> *v4l2_dev, diff --git a/include/media/v4l2-common.h
> b/include/media/v4l2-common.h index c48c24e..a67f5c3 100644
> --- a/include/media/v4l2-common.h
> +++ b/include/media/v4l2-common.h
> @@ -131,6 +131,7 @@ struct i2c_driver;
> struct i2c_adapter;
> struct i2c_client;
> struct i2c_device_id;
> +struct i2c_board_info;
> struct v4l2_device;
> struct v4l2_subdev;
> struct v4l2_subdev_ops;
> @@ -142,6 +143,10 @@ struct v4l2_subdev_ops;
> struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
> struct i2c_adapter *adapter,
> const char *module_name, const char *client_type, u8 addr);
> +/* Same as above but uses user-provided struct i2c_board_info */
> +struct v4l2_subdev *v4l2_i2c_subdev_board(struct v4l2_device *v4l2_dev,
> + struct i2c_adapter *adapter,
> + const char *module_name, const struct i2c_board_info *info);
> /* Probe and load an i2c module and return an initialized v4l2_subdev
> struct. Only call request_module if module_name != NULL.
> The client_type argument is the name of the chip that's on the
> adapter. */
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
