| Message ID | 1371651054-28684-1-git-send-email-a.hajda@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
This patch has been sitting around for quite some time now. Is there any reason not to apply it? Laurent, I see that these patches (part of the same patch set) are still pending for you: https://patchwork.linuxtv.org/patch/18447/ https://patchwork.linuxtv.org/patch/18449/ If you plan to apply those for 3.12, then it would make sense to apply this one at the same time. For this patch: Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Regards, Hans On Wed 19 June 2013 16:10:54 Andrzej Hajda wrote: > This patch adds managed version of initialization > function for v4l2 i2c subdevices. > > Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> > Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > v4: > - added description to devm_v4l2_subdev_bind > v3: > - removed devm_v4l2_subdev_(init|free), > v2: > - changes of v4l2-ctrls.h moved to proper patch > --- > drivers/media/v4l2-core/v4l2-common.c | 10 ++++++++++ > drivers/media/v4l2-core/v4l2-subdev.c | 35 +++++++++++++++++++++++++++++++++++ > include/media/v4l2-common.h | 2 ++ > include/media/v4l2-subdev.h | 2 ++ > 4 files changed, 49 insertions(+) > > diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c > index 3fed63f..96aac931 100644 > --- a/drivers/media/v4l2-core/v4l2-common.c > +++ b/drivers/media/v4l2-core/v4l2-common.c > @@ -301,7 +301,17 @@ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client, > } > EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init); > > +int devm_v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client, > + const struct v4l2_subdev_ops *ops) > +{ > + int ret; > > + ret = devm_v4l2_subdev_bind(&client->dev, sd); > + if (!ret) > + v4l2_i2c_subdev_init(sd, client, ops); > + return ret; > +} > +EXPORT_SYMBOL_GPL(devm_v4l2_i2c_subdev_init); > > /* Load an i2c sub-device. */ > struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev, > diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c > index 996c248..2242962 100644 > --- a/drivers/media/v4l2-core/v4l2-subdev.c > +++ b/drivers/media/v4l2-core/v4l2-subdev.c > @@ -474,3 +474,38 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops) > #endif > } > EXPORT_SYMBOL(v4l2_subdev_init); > + > +static void devm_v4l2_subdev_release(struct device *dev, void *res) > +{ > + struct v4l2_subdev **sd = res; > + > + v4l2_device_unregister_subdev(*sd); > +#if defined(CONFIG_MEDIA_CONTROLLER) > + media_entity_cleanup(&(*sd)->entity); > +#endif > +} > + > +/** > + * devm_v4l2_subdev_bind - Add subdevice to device managed resource list > + * @dev: Device to bind subdev to > + * @sd: Subdevice to bind > + * > + * Function adds device managed release code to the subdev. > + * If the function succeedes then on driver detach subdev will be automatically > + * unregistered and the media entity will be cleaned up. Function can be used > + * with subdevs not initialized by devm_v4l2_i2c_subdev_init. > + */ > +int devm_v4l2_subdev_bind(struct device *dev, struct v4l2_subdev *sd) > +{ > + struct v4l2_subdev **dr; > + > + dr = devres_alloc(devm_v4l2_subdev_release, sizeof(*dr), GFP_KERNEL); > + if (!dr) > + return -ENOMEM; > + > + *dr = sd; > + devres_add(dev, dr); > + > + return 0; > +} > +EXPORT_SYMBOL(devm_v4l2_subdev_bind); > diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h > index 1d93c48..da62e2b 100644 > --- a/include/media/v4l2-common.h > +++ b/include/media/v4l2-common.h > @@ -136,6 +136,8 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev, > /* Initialize a v4l2_subdev with data from an i2c_client struct */ > void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client, > const struct v4l2_subdev_ops *ops); > +int devm_v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client, > + const struct v4l2_subdev_ops *ops); > /* Return i2c client address of v4l2_subdev. */ > unsigned short v4l2_i2c_subdev_addr(struct v4l2_subdev *sd); > > diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h > index 5298d67..e086cfe 100644 > --- a/include/media/v4l2-subdev.h > +++ b/include/media/v4l2-subdev.h > @@ -657,6 +657,8 @@ int v4l2_subdev_link_validate(struct media_link *link); > void v4l2_subdev_init(struct v4l2_subdev *sd, > const struct v4l2_subdev_ops *ops); > > +int devm_v4l2_subdev_bind(struct device *dev, struct v4l2_subdev *sd); > + > /* Call an ops of a v4l2_subdev, doing the right checks against > NULL pointers. > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/22/2013 01:10 PM, Hans Verkuil wrote: > This patch has been sitting around for quite some time now. Is there any reason > not to apply it? We wanted to merge those patches together with some users of them. We have already prepared relevant patches but those depend on other ones (conversion to v4l2-async/DT, some pending review) and I didn't find enough time to post everything. I won't find time to take care of this for 3.12, sorry. I guess it could be postponed to 3.13. -- Regards, Sylwester -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c index 3fed63f..96aac931 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -301,7 +301,17 @@ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client, } EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init); +int devm_v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client, + const struct v4l2_subdev_ops *ops) +{ + int ret; + ret = devm_v4l2_subdev_bind(&client->dev, sd); + if (!ret) + v4l2_i2c_subdev_init(sd, client, ops); + return ret; +} +EXPORT_SYMBOL_GPL(devm_v4l2_i2c_subdev_init); /* Load an i2c sub-device. */ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev, diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 996c248..2242962 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -474,3 +474,38 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops) #endif } EXPORT_SYMBOL(v4l2_subdev_init); + +static void devm_v4l2_subdev_release(struct device *dev, void *res) +{ + struct v4l2_subdev **sd = res; + + v4l2_device_unregister_subdev(*sd); +#if defined(CONFIG_MEDIA_CONTROLLER) + media_entity_cleanup(&(*sd)->entity); +#endif +} + +/** + * devm_v4l2_subdev_bind - Add subdevice to device managed resource list + * @dev: Device to bind subdev to + * @sd: Subdevice to bind + * + * Function adds device managed release code to the subdev. + * If the function succeedes then on driver detach subdev will be automatically + * unregistered and the media entity will be cleaned up. Function can be used + * with subdevs not initialized by devm_v4l2_i2c_subdev_init. + */ +int devm_v4l2_subdev_bind(struct device *dev, struct v4l2_subdev *sd) +{ + struct v4l2_subdev **dr; + + dr = devres_alloc(devm_v4l2_subdev_release, sizeof(*dr), GFP_KERNEL); + if (!dr) + return -ENOMEM; + + *dr = sd; + devres_add(dev, dr); + + return 0; +} +EXPORT_SYMBOL(devm_v4l2_subdev_bind); diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 1d93c48..da62e2b 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -136,6 +136,8 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev, /* Initialize a v4l2_subdev with data from an i2c_client struct */ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client, const struct v4l2_subdev_ops *ops); +int devm_v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client, + const struct v4l2_subdev_ops *ops); /* Return i2c client address of v4l2_subdev. */ unsigned short v4l2_i2c_subdev_addr(struct v4l2_subdev *sd); diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 5298d67..e086cfe 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -657,6 +657,8 @@ int v4l2_subdev_link_validate(struct media_link *link); void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops); +int devm_v4l2_subdev_bind(struct device *dev, struct v4l2_subdev *sd); + /* Call an ops of a v4l2_subdev, doing the right checks against NULL pointers.