[PATCH 4/4] drm: drm_dev_set_unique private, again

[Daniel Vetter]

On Wed, Mar 28, 2018 at 02:24:51AM +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> As of last commit we hide this from the drivers.
> 
> Effectively reverts commit a6b5fac59cb216ac906f02300d3630c24520d9ef.
> 
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

Yay!

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/drm_drv.c | 38 ++++++++++++++------------------------
>  include/drm/drm_drv.h     |  3 ---
>  2 files changed, 14 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 88da984ff9eb..26e360a0e50c 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -266,10 +266,9 @@ void drm_minor_release(struct drm_minor *minor)
>   * callbacks implemented by the driver. The driver then needs to initialize all
>   * the various subsystems for the drm device like memory management, vblank
>   * handling, modesetting support and intial output configuration plus obviously
> - * initialize all the corresponding hardware bits. An important part of this is
> - * also calling drm_dev_set_unique() to set the userspace-visible unique name of
> - * this device instance. Finally when everything is up and running and ready for
> - * userspace the device instance can be published using drm_dev_register().
> + * initialize all the corresponding hardware bits. Finally when everything is up
> + * and running and ready for userspace the device instance can be published
> + * using drm_dev_register().
>   *
>   * There is also deprecated support for initalizing device instances using
>   * bus-specific helpers and the &drm_driver.load callback. But due to
> @@ -290,6 +289,17 @@ void drm_minor_release(struct drm_minor *minor)
>   * structure, which is supported through drm_dev_init().
>   */
>  
> +static int drm_dev_set_unique(struct drm_device *dev, const char *name)
> +{
> +	if (!name)
> +		return -EINVAL;
> +
> +	kfree(dev->unique);
> +	dev->unique = kstrdup(name, GFP_KERNEL);
> +
> +	return dev->unique ? 0 : -ENOMEM;
> +}
> +
>  /**
>   * drm_put_dev - Unregister and release a DRM device
>   * @dev: DRM device
> @@ -840,26 +850,6 @@ void drm_dev_unregister(struct drm_device *dev)
>  }
>  EXPORT_SYMBOL(drm_dev_unregister);
>  
> -/**
> - * drm_dev_set_unique - Set the unique name of a DRM device
> - * @dev: device of which to set the unique name
> - * @name: unique name
> - *
> - * Sets the unique name of a DRM device using the specified string. Drivers
> - * can use this at driver probe time if the unique name of the devices they
> - * drive is static.
> - *
> - * Return: 0 on success or a negative error code on failure.
> - */
> -int drm_dev_set_unique(struct drm_device *dev, const char *name)
> -{
> -	kfree(dev->unique);
> -	dev->unique = kstrdup(name, GFP_KERNEL);
> -
> -	return dev->unique ? 0 : -ENOMEM;
> -}
> -EXPORT_SYMBOL(drm_dev_set_unique);
> -
>  /*
>   * DRM Core
>   * The DRM core module initializes all global DRM objects and makes them
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index d32b688eb346..3e6671fc9ced 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -642,7 +642,4 @@ static inline int drm_dev_is_unplugged(struct drm_device *dev)
>  }
>  
>  
> -int drm_dev_set_unique(struct drm_device *dev, const char *name);
> -
> -
>  #endif
> -- 
> 2.16.0
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch