| Message ID | 20231220103713.113386-13-sakari.ailus@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | Media device lifetime management | expand |
Hi Sakari, Thank you for the patch. On Wed, Dec 20, 2023 at 12:36:56PM +0200, 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> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/mc/mc-device.c | 54 ++++++++++++++++++------------------ > 1 file changed, 27 insertions(+), 27 deletions(-) > > diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c > index ebf037cd5f4a..44685ab6a450 100644 > --- a/drivers/media/mc/mc-device.c > +++ b/drivers/media/mc/mc-device.c > @@ -673,6 +673,33 @@ void media_device_unregister_entity(struct media_entity *entity) > } > EXPORT_SYMBOL_GPL(media_device_unregister_entity); > > +void 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); > +} > +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_init(struct media_device *mdev) > { > INIT_LIST_HEAD(&mdev->entities); > @@ -740,33 +767,6 @@ int __must_check __media_device_register(struct media_device *mdev, > } > EXPORT_SYMBOL_GPL(__media_device_register); > > -void 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); > -} > -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;
diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c index ebf037cd5f4a..44685ab6a450 100644 --- a/drivers/media/mc/mc-device.c +++ b/drivers/media/mc/mc-device.c @@ -673,6 +673,33 @@ void media_device_unregister_entity(struct media_entity *entity) } EXPORT_SYMBOL_GPL(media_device_unregister_entity); +void 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); +} +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_init(struct media_device *mdev) { INIT_LIST_HEAD(&mdev->entities); @@ -740,33 +767,6 @@ int __must_check __media_device_register(struct media_device *mdev, } EXPORT_SYMBOL_GPL(__media_device_register); -void 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); -} -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;