Commit f73aca50 authored by David Herrmann's avatar David Herrmann Committed by Dave Airlie

drm: call drm_unplug_minor() from drm_put_minor()

This protects drm_unplug_minor() against repeated calls so we can use it
in drm_put_minor(). This allows us to further simplify it in follow-ups as
we no longer do minor-destruction in both functions but only in
drm_unplug_minor().
Also add kernel-doc comments about what these calls do.

[airlied: fixup for changes to kdev stuff]
Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 02ee4e94
...@@ -324,10 +324,30 @@ int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type) ...@@ -324,10 +324,30 @@ int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type)
EXPORT_SYMBOL(drm_get_minor); EXPORT_SYMBOL(drm_get_minor);
/** /**
* Put a secondary minor number. * drm_unplug_minor - Unplug DRM minor
* @minor: Minor to unplug
* *
* \param sec_minor - structure to be released * Unplugs the given DRM minor but keeps the object. So after this returns,
* \return always zero * minor->dev is still valid so existing open-files can still access it to get
* device information from their drm_file ojects.
* If the minor is already unplugged or if @minor is NULL, nothing is done.
* The global DRM mutex must be held by the caller.
*/
static void drm_unplug_minor(struct drm_minor *minor)
{
if (!minor || !device_is_registered(minor->kdev))
return;
drm_sysfs_device_remove(minor);
}
/**
* drm_put_minor - Destroy DRM minor
* @minor_p: Double pointer to DRM minor
*
* This calls drm_unplug_minor() on the given minor and then frees it. The minor
* pointer is reset to NULL before this returns.
* The global DRM mutex must be held by the caller.
*/ */
int drm_put_minor(struct drm_minor **minor_p) int drm_put_minor(struct drm_minor **minor_p)
{ {
...@@ -339,7 +359,7 @@ int drm_put_minor(struct drm_minor **minor_p) ...@@ -339,7 +359,7 @@ int drm_put_minor(struct drm_minor **minor_p)
drm_debugfs_cleanup(minor); drm_debugfs_cleanup(minor);
#endif #endif
drm_sysfs_device_remove(minor); drm_unplug_minor(minor);
idr_remove(&drm_minors_idr, minor->index); idr_remove(&drm_minors_idr, minor->index);
...@@ -349,11 +369,6 @@ int drm_put_minor(struct drm_minor **minor_p) ...@@ -349,11 +369,6 @@ int drm_put_minor(struct drm_minor **minor_p)
} }
EXPORT_SYMBOL(drm_put_minor); EXPORT_SYMBOL(drm_put_minor);
static void drm_unplug_minor(struct drm_minor *minor)
{
drm_sysfs_device_remove(minor);
}
/** /**
* Called via drm_exit() at module unload time or when pci device is * Called via drm_exit() at module unload time or when pci device is
* unplugged. * unplugged.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment