| Message ID | 1471602228-30722-14-git-send-email-sakari.ailus@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/19/2016 12:23 PM, Sakari Ailus wrote: > As the call paths of the functions in question will change, move them > around in anticipation of that. No other changes. > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> > --- > drivers/media/media-device.c | 88 ++++++++++++++++++++++---------------------- > 1 file changed, 44 insertions(+), 44 deletions(-) > > diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c > index 7f90cb82..0656daf 100644 > --- a/drivers/media/media-device.c > +++ b/drivers/media/media-device.c > @@ -542,22 +542,6 @@ static DEVICE_ATTR(model, S_IRUGO, show_model, NULL); > * Registration/unregistration > */ > > -static void media_device_release(struct media_devnode *devnode) > -{ > - struct media_device *mdev = to_media_device(devnode); > - > - ida_destroy(&mdev->entity_internal_idx); > - mdev->entity_internal_idx_max = 0; > - media_entity_graph_walk_cleanup(&mdev->pm_count_walk); > - mutex_destroy(&mdev->graph_mutex); > - dev_dbg(devnode->parent, "Media device released\n"); > - > - if (mdev->release) > - mdev->release(mdev); > - > - kfree(mdev); > -} > - > /** > * media_device_register_entity - Register an entity with a media device > * @mdev: The media device > @@ -678,6 +662,34 @@ void media_device_unregister_entity(struct media_entity *entity) > } > EXPORT_SYMBOL_GPL(media_device_unregister_entity); > > +int __must_check media_device_register_entity_notify(struct media_device *mdev, > + struct media_entity_notify *nptr) > +{ > + mutex_lock(&mdev->graph_mutex); > + list_add_tail(&nptr->list, &mdev->entity_notify); > + mutex_unlock(&mdev->graph_mutex); > + return 0; > +} > +EXPORT_SYMBOL_GPL(media_device_register_entity_notify); > + > +/* > + * Note: Should be called with mdev->lock held. > + */ > +static void __media_device_unregister_entity_notify(struct media_device *mdev, > + struct media_entity_notify *nptr) > +{ > + list_del(&nptr->list); > +} > + > +void media_device_unregister_entity_notify(struct media_device *mdev, > + struct media_entity_notify *nptr) > +{ > + mutex_lock(&mdev->graph_mutex); > + __media_device_unregister_entity_notify(mdev, nptr); > + mutex_unlock(&mdev->graph_mutex); > +} > +EXPORT_SYMBOL_GPL(media_device_unregister_entity_notify); > + > /** > * media_device_init() - initialize a media device > * @mdev: The media device > @@ -741,6 +753,22 @@ void media_device_cleanup(struct media_device *mdev) > } > EXPORT_SYMBOL_GPL(media_device_cleanup); > > +static void media_device_release(struct media_devnode *devnode) > +{ > + struct media_device *mdev = to_media_device(devnode); > + > + ida_destroy(&mdev->entity_internal_idx); > + mdev->entity_internal_idx_max = 0; > + media_entity_graph_walk_cleanup(&mdev->pm_count_walk); > + mutex_destroy(&mdev->graph_mutex); > + dev_dbg(devnode->parent, "Media device released\n"); > + > + if (mdev->release) > + mdev->release(mdev); > + > + kfree(mdev); > +} > + > int __must_check __media_device_register(struct media_device *mdev, > struct module *owner) > { > @@ -770,34 +798,6 @@ int __must_check __media_device_register(struct media_device *mdev, > } > EXPORT_SYMBOL_GPL(__media_device_register); > > -int __must_check media_device_register_entity_notify(struct media_device *mdev, > - struct media_entity_notify *nptr) > -{ > - mutex_lock(&mdev->graph_mutex); > - list_add_tail(&nptr->list, &mdev->entity_notify); > - mutex_unlock(&mdev->graph_mutex); > - return 0; > -} > -EXPORT_SYMBOL_GPL(media_device_register_entity_notify); > - > -/* > - * Note: Should be called with mdev->lock held. > - */ > -static void __media_device_unregister_entity_notify(struct media_device *mdev, > - struct media_entity_notify *nptr) > -{ > - list_del(&nptr->list); > -} > - > -void media_device_unregister_entity_notify(struct media_device *mdev, > - struct media_entity_notify *nptr) > -{ > - mutex_lock(&mdev->graph_mutex); > - __media_device_unregister_entity_notify(mdev, nptr); > - mutex_unlock(&mdev->graph_mutex); > -} > -EXPORT_SYMBOL_GPL(media_device_unregister_entity_notify); > - > void media_device_unregister(struct media_device *mdev) > { > struct media_entity *entity; > -- 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/media-device.c b/drivers/media/media-device.c index 7f90cb82..0656daf 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -542,22 +542,6 @@ static DEVICE_ATTR(model, S_IRUGO, show_model, NULL); * Registration/unregistration */ -static void media_device_release(struct media_devnode *devnode) -{ - struct media_device *mdev = to_media_device(devnode); - - ida_destroy(&mdev->entity_internal_idx); - mdev->entity_internal_idx_max = 0; - media_entity_graph_walk_cleanup(&mdev->pm_count_walk); - mutex_destroy(&mdev->graph_mutex); - dev_dbg(devnode->parent, "Media device released\n"); - - if (mdev->release) - mdev->release(mdev); - - kfree(mdev); -} - /** * media_device_register_entity - Register an entity with a media device * @mdev: The media device @@ -678,6 +662,34 @@ void media_device_unregister_entity(struct media_entity *entity) } EXPORT_SYMBOL_GPL(media_device_unregister_entity); +int __must_check media_device_register_entity_notify(struct media_device *mdev, + struct media_entity_notify *nptr) +{ + mutex_lock(&mdev->graph_mutex); + list_add_tail(&nptr->list, &mdev->entity_notify); + mutex_unlock(&mdev->graph_mutex); + return 0; +} +EXPORT_SYMBOL_GPL(media_device_register_entity_notify); + +/* + * Note: Should be called with mdev->lock held. + */ +static void __media_device_unregister_entity_notify(struct media_device *mdev, + struct media_entity_notify *nptr) +{ + list_del(&nptr->list); +} + +void media_device_unregister_entity_notify(struct media_device *mdev, + struct media_entity_notify *nptr) +{ + mutex_lock(&mdev->graph_mutex); + __media_device_unregister_entity_notify(mdev, nptr); + mutex_unlock(&mdev->graph_mutex); +} +EXPORT_SYMBOL_GPL(media_device_unregister_entity_notify); + /** * media_device_init() - initialize a media device * @mdev: The media device @@ -741,6 +753,22 @@ void media_device_cleanup(struct media_device *mdev) } EXPORT_SYMBOL_GPL(media_device_cleanup); +static void media_device_release(struct media_devnode *devnode) +{ + struct media_device *mdev = to_media_device(devnode); + + ida_destroy(&mdev->entity_internal_idx); + mdev->entity_internal_idx_max = 0; + media_entity_graph_walk_cleanup(&mdev->pm_count_walk); + mutex_destroy(&mdev->graph_mutex); + dev_dbg(devnode->parent, "Media device released\n"); + + if (mdev->release) + mdev->release(mdev); + + kfree(mdev); +} + int __must_check __media_device_register(struct media_device *mdev, struct module *owner) { @@ -770,34 +798,6 @@ int __must_check __media_device_register(struct media_device *mdev, } EXPORT_SYMBOL_GPL(__media_device_register); -int __must_check media_device_register_entity_notify(struct media_device *mdev, - struct media_entity_notify *nptr) -{ - mutex_lock(&mdev->graph_mutex); - list_add_tail(&nptr->list, &mdev->entity_notify); - mutex_unlock(&mdev->graph_mutex); - return 0; -} -EXPORT_SYMBOL_GPL(media_device_register_entity_notify); - -/* - * Note: Should be called with mdev->lock held. - */ -static void __media_device_unregister_entity_notify(struct media_device *mdev, - struct media_entity_notify *nptr) -{ - list_del(&nptr->list); -} - -void media_device_unregister_entity_notify(struct media_device *mdev, - struct media_entity_notify *nptr) -{ - mutex_lock(&mdev->graph_mutex); - __media_device_unregister_entity_notify(mdev, nptr); - mutex_unlock(&mdev->graph_mutex); -} -EXPORT_SYMBOL_GPL(media_device_unregister_entity_notify); - void media_device_unregister(struct media_device *mdev) { struct media_entity *entity;
As the call paths of the functions in question will change, move them around in anticipation of that. No other changes. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/media/media-device.c | 88 ++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-)