On 10/06/2024 12:05, 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@xxxxxxxxxxxxxxx> > Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> That should be: Acked-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx> Regards, Hans > Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> > --- > 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 dd4d589a6701..f1f3addf7932 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;