| Message ID | c7f3e48e130dd397046f59383921960a43f6eed8.1431110739.git.shuahkh@osg.samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/08/2015 09:31 PM, Shuah Khan wrote: > Add new media controller API to allocate media device as a > device resource. When a media device is created on the main > struct device which is the parent device for the interface > device, it will be available to all drivers associated with > that interface. For example, if a usb media device driver > creates the media device on the main struct device which is > common for all the drivers that control the media device, > including the non-media ALSA driver, media controller API > can be used to share access to the resources on the media > device. This new interface provides the above described > feature. A second interface that finds and returns the media > device is added to allow drivers to find the media device > created by any of the drivers associated with the device. > > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> > --- > drivers/media/media-device.c | 33 +++++++++++++++++++++++++++++++++ > include/media/media-device.h | 2 ++ > 2 files changed, 35 insertions(+) > > diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c > index 7b39440..1c32752 100644 > --- a/drivers/media/media-device.c > +++ b/drivers/media/media-device.c > @@ -462,3 +462,36 @@ void media_device_unregister_entity(struct media_entity *entity) > entity->parent = NULL; > } > EXPORT_SYMBOL_GPL(media_device_unregister_entity); > + > +static void media_device_release_dr(struct device *dev, void *res) > +{ > +} > + > +/* > + * media_device_get_dr() - get media device as device resource > + * creates if one doesn't exist > +*/ > +struct media_device *media_device_get_dr(struct device *dev) I'd use get_devres rather than get_dr. I keep thinking that get_dr means get_driver. It's too ambiguous, I think. Regards, Hans > +{ > + struct media_device *mdev; > + > + mdev = devres_find(dev, media_device_release_dr, NULL, NULL); > + if (mdev) > + return mdev; > + > + mdev = devres_alloc(media_device_release_dr, > + sizeof(struct media_device), GFP_KERNEL); > + if (!mdev) > + return NULL; > + return devres_get(dev, mdev, NULL, NULL); > +} > +EXPORT_SYMBOL_GPL(media_device_get_dr); > + > +/* > + * media_device_find_dr() - find media device as device resource > +*/ > +struct media_device *media_device_find_dr(struct device *dev) > +{ > + return devres_find(dev, media_device_release_dr, NULL, NULL); > +} > +EXPORT_SYMBOL_GPL(media_device_find_dr); > diff --git a/include/media/media-device.h b/include/media/media-device.h > index 6e6db78..53d0fc3 100644 > --- a/include/media/media-device.h > +++ b/include/media/media-device.h > @@ -95,6 +95,8 @@ void media_device_unregister(struct media_device *mdev); > int __must_check media_device_register_entity(struct media_device *mdev, > struct media_entity *entity); > void media_device_unregister_entity(struct media_entity *entity); > +struct media_device *media_device_get_dr(struct device *dev); > +struct media_device *media_device_find_dr(struct device *dev); > > /* Iterate over all entities. */ > #define media_device_for_each_entity(entity, mdev) \ >
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 7b39440..1c32752 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -462,3 +462,36 @@ void media_device_unregister_entity(struct media_entity *entity) entity->parent = NULL; } EXPORT_SYMBOL_GPL(media_device_unregister_entity); + +static void media_device_release_dr(struct device *dev, void *res) +{ +} + +/* + * media_device_get_dr() - get media device as device resource + * creates if one doesn't exist +*/ +struct media_device *media_device_get_dr(struct device *dev) +{ + struct media_device *mdev; + + mdev = devres_find(dev, media_device_release_dr, NULL, NULL); + if (mdev) + return mdev; + + mdev = devres_alloc(media_device_release_dr, + sizeof(struct media_device), GFP_KERNEL); + if (!mdev) + return NULL; + return devres_get(dev, mdev, NULL, NULL); +} +EXPORT_SYMBOL_GPL(media_device_get_dr); + +/* + * media_device_find_dr() - find media device as device resource +*/ +struct media_device *media_device_find_dr(struct device *dev) +{ + return devres_find(dev, media_device_release_dr, NULL, NULL); +} +EXPORT_SYMBOL_GPL(media_device_find_dr); diff --git a/include/media/media-device.h b/include/media/media-device.h index 6e6db78..53d0fc3 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -95,6 +95,8 @@ void media_device_unregister(struct media_device *mdev); int __must_check media_device_register_entity(struct media_device *mdev, struct media_entity *entity); void media_device_unregister_entity(struct media_entity *entity); +struct media_device *media_device_get_dr(struct device *dev); +struct media_device *media_device_find_dr(struct device *dev); /* Iterate over all entities. */ #define media_device_for_each_entity(entity, mdev) \
Add new media controller API to allocate media device as a device resource. When a media device is created on the main struct device which is the parent device for the interface device, it will be available to all drivers associated with that interface. For example, if a usb media device driver creates the media device on the main struct device which is common for all the drivers that control the media device, including the non-media ALSA driver, media controller API can be used to share access to the resources on the media device. This new interface provides the above described feature. A second interface that finds and returns the media device is added to allow drivers to find the media device created by any of the drivers associated with the device. Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> --- drivers/media/media-device.c | 33 +++++++++++++++++++++++++++++++++ include/media/media-device.h | 2 ++ 2 files changed, 35 insertions(+)