| Message ID | 20161207183025.20684-3-khilman@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Kevin, On Wed, Dec 07, 2016 at 10:30:22AM -0800, Kevin Hilman wrote: > Remove hard-coded I2C adapter in favor of getting the > ID from platform_data. > > Signed-off-by: Kevin Hilman <khilman@baylibre.com> > --- > drivers/media/platform/davinci/vpif_capture.c | 5 ++++- > include/media/davinci/vpif_types.h | 1 + > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c > index 20c4344ed118..c24049acd40a 100644 > --- a/drivers/media/platform/davinci/vpif_capture.c > +++ b/drivers/media/platform/davinci/vpif_capture.c > @@ -1486,7 +1486,10 @@ static __init int vpif_probe(struct platform_device *pdev) > } > > if (!vpif_obj.config->asd_sizes) { > - i2c_adap = i2c_get_adapter(1); > + int i2c_id = vpif_obj.config->i2c_adapter_id; Is there a particular reason to use a temporary variable just once? I'd use the i2c_adapter_field directly instead. Up to you. Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> > + > + i2c_adap = i2c_get_adapter(i2c_id); > + WARN_ON(!i2c_adap); > for (i = 0; i < subdev_count; i++) { > subdevdata = &vpif_obj.config->subdev_info[i]; > vpif_obj.sd[i] = > diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h > index 3cb1704a0650..4282a7db99d4 100644 > --- a/include/media/davinci/vpif_types.h > +++ b/include/media/davinci/vpif_types.h > @@ -82,6 +82,7 @@ struct vpif_capture_config { > struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS]; > struct vpif_subdev_info *subdev_info; > int subdev_count; > + int i2c_adapter_id; > const char *card_name; > struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */ > int *asd_sizes; /* 0-terminated array of asd group sizes */
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 20c4344ed118..c24049acd40a 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -1486,7 +1486,10 @@ static __init int vpif_probe(struct platform_device *pdev) } if (!vpif_obj.config->asd_sizes) { - i2c_adap = i2c_get_adapter(1); + int i2c_id = vpif_obj.config->i2c_adapter_id; + + i2c_adap = i2c_get_adapter(i2c_id); + WARN_ON(!i2c_adap); for (i = 0; i < subdev_count; i++) { subdevdata = &vpif_obj.config->subdev_info[i]; vpif_obj.sd[i] = diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h index 3cb1704a0650..4282a7db99d4 100644 --- a/include/media/davinci/vpif_types.h +++ b/include/media/davinci/vpif_types.h @@ -82,6 +82,7 @@ struct vpif_capture_config { struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS]; struct vpif_subdev_info *subdev_info; int subdev_count; + int i2c_adapter_id; const char *card_name; struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */ int *asd_sizes; /* 0-terminated array of asd group sizes */
Remove hard-coded I2C adapter in favor of getting the ID from platform_data. Signed-off-by: Kevin Hilman <khilman@baylibre.com> --- drivers/media/platform/davinci/vpif_capture.c | 5 ++++- include/media/davinci/vpif_types.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)