| Message ID | 1471602228-30722-15-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: > The media device itself will be unregistered based on it being unbound and > driver's remove callback being called. The graph objects themselves may > still be in use; rely on the media device release callback to release > them. > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> > --- > drivers/media/media-device.c | 44 ++++++++++++++++++++------------------------ > 1 file changed, 20 insertions(+), 24 deletions(-) > > diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c > index 0656daf..cbbc397 100644 > --- a/drivers/media/media-device.c > +++ b/drivers/media/media-device.c > @@ -756,6 +756,26 @@ EXPORT_SYMBOL_GPL(media_device_cleanup); > static void media_device_release(struct media_devnode *devnode) > { > struct media_device *mdev = to_media_device(devnode); > + struct media_entity *entity; > + struct media_entity *next; > + struct media_interface *intf, *tmp_intf; > + struct media_entity_notify *notify, *nextp; > + > + /* Remove all entities from the media device */ > + list_for_each_entry_safe(entity, next, &mdev->entities, graph_obj.list) > + __media_device_unregister_entity(entity); > + > + /* Remove all entity_notify callbacks from the media device */ > + list_for_each_entry_safe(notify, nextp, &mdev->entity_notify, list) > + __media_device_unregister_entity_notify(mdev, notify); > + > + /* Remove all interfaces from the media device */ > + list_for_each_entry_safe(intf, tmp_intf, &mdev->interfaces, > + graph_obj.list) { > + __media_remove_intf_links(intf); > + media_gobj_destroy(&intf->graph_obj); > + kfree(intf); > + } > > ida_destroy(&mdev->entity_internal_idx); > mdev->entity_internal_idx_max = 0; > @@ -800,38 +820,14 @@ EXPORT_SYMBOL_GPL(__media_device_register); > > void media_device_unregister(struct media_device *mdev) > { > - struct media_entity *entity; > - struct media_entity *next; > - struct media_interface *intf, *tmp_intf; > - struct media_entity_notify *notify, *nextp; > - > if (mdev == NULL) > return; > > mutex_lock(&mdev->graph_mutex); > - > - /* Check if mdev was ever registered at all */ > if (!media_devnode_is_registered(&mdev->devnode)) { > mutex_unlock(&mdev->graph_mutex); > return; > } > - > - /* Remove all entities from the media device */ > - list_for_each_entry_safe(entity, next, &mdev->entities, graph_obj.list) > - __media_device_unregister_entity(entity); > - > - /* Remove all entity_notify callbacks from the media device */ > - list_for_each_entry_safe(notify, nextp, &mdev->entity_notify, list) > - __media_device_unregister_entity_notify(mdev, notify); > - > - /* Remove all interfaces from the media device */ > - list_for_each_entry_safe(intf, tmp_intf, &mdev->interfaces, > - graph_obj.list) { > - __media_remove_intf_links(intf); > - media_gobj_destroy(&intf->graph_obj); > - kfree(intf); > - } > - > mutex_unlock(&mdev->graph_mutex); > > device_remove_file(&mdev->devnode.dev, &dev_attr_model); > -- 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 0656daf..cbbc397 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -756,6 +756,26 @@ EXPORT_SYMBOL_GPL(media_device_cleanup); static void media_device_release(struct media_devnode *devnode) { struct media_device *mdev = to_media_device(devnode); + struct media_entity *entity; + struct media_entity *next; + struct media_interface *intf, *tmp_intf; + struct media_entity_notify *notify, *nextp; + + /* Remove all entities from the media device */ + list_for_each_entry_safe(entity, next, &mdev->entities, graph_obj.list) + __media_device_unregister_entity(entity); + + /* Remove all entity_notify callbacks from the media device */ + list_for_each_entry_safe(notify, nextp, &mdev->entity_notify, list) + __media_device_unregister_entity_notify(mdev, notify); + + /* Remove all interfaces from the media device */ + list_for_each_entry_safe(intf, tmp_intf, &mdev->interfaces, + graph_obj.list) { + __media_remove_intf_links(intf); + media_gobj_destroy(&intf->graph_obj); + kfree(intf); + } ida_destroy(&mdev->entity_internal_idx); mdev->entity_internal_idx_max = 0; @@ -800,38 +820,14 @@ EXPORT_SYMBOL_GPL(__media_device_register); void media_device_unregister(struct media_device *mdev) { - struct media_entity *entity; - struct media_entity *next; - struct media_interface *intf, *tmp_intf; - struct media_entity_notify *notify, *nextp; - if (mdev == NULL) return; mutex_lock(&mdev->graph_mutex); - - /* Check if mdev was ever registered at all */ if (!media_devnode_is_registered(&mdev->devnode)) { mutex_unlock(&mdev->graph_mutex); return; } - - /* Remove all entities from the media device */ - list_for_each_entry_safe(entity, next, &mdev->entities, graph_obj.list) - __media_device_unregister_entity(entity); - - /* Remove all entity_notify callbacks from the media device */ - list_for_each_entry_safe(notify, nextp, &mdev->entity_notify, list) - __media_device_unregister_entity_notify(mdev, notify); - - /* Remove all interfaces from the media device */ - list_for_each_entry_safe(intf, tmp_intf, &mdev->interfaces, - graph_obj.list) { - __media_remove_intf_links(intf); - media_gobj_destroy(&intf->graph_obj); - kfree(intf); - } - mutex_unlock(&mdev->graph_mutex); device_remove_file(&mdev->devnode.dev, &dev_attr_model);
The media device itself will be unregistered based on it being unbound and driver's remove callback being called. The graph objects themselves may still be in use; rely on the media device release callback to release them. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/media/media-device.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-)