Acked-By: Mike Isely <isely@xxxxxxxxx>
On Fri, 24 Sep 2010, Laurent Pinchart wrote:
> With the v4l2_i2c_new_subdev* functions now supporting loading modules
> based on modaliases, replace the hardcoded module name passed to those
> functions by NULL.
>
> All corresponding I2C modules have been checked, and all of them include
> a module aliases table with names corresponding to what the pvrusb2
> driver uses.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/video/pvrusb2/pvrusb2-hdw.c | 11 ++---------
> 1 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
> index 70ea578..bef2027 100644
> --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
> +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
> @@ -2082,20 +2082,13 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
> return -EINVAL;
> }
>
> - /* Note how the 2nd and 3rd arguments are the same for
> - * v4l2_i2c_new_subdev(). Why?
> - * Well the 2nd argument is the module name to load, while the 3rd
> - * argument is documented in the framework as being the "chipid" -
> - * and every other place where I can find examples of this, the
> - * "chipid" appears to just be the module name again. So here we
> - * just do the same thing. */
> if (i2ccnt == 1) {
> pvr2_trace(PVR2_TRACE_INIT,
> "Module ID %u:"
> " Setting up with specified i2c address 0x%x",
> mid, i2caddr[0]);
> sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
> - fname, fname,
> + NULL, fname,
> i2caddr[0], NULL);
> } else {
> pvr2_trace(PVR2_TRACE_INIT,
> @@ -2103,7 +2096,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
> " Setting up with address probe list",
> mid);
> sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
> - fname, fname,
> + NULL, fname,
> 0, i2caddr);
> }
>
>
--
Mike Isely
isely @ isely (dot) net
PGP: 03 54 43 4D 75 E5 CC 92 71 16 01 E2 B5 F5 C1 E8
--
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
