On 03/08/16 19:04, David Herrmann wrote:
> The minor referred to by "DRM_MINOR_LEGACY" is called 'dev->primary' and
> gets 'cardX' as name assigned. Lets reduce this magnificent number of
> names for the same concept by one and rename DRM_MINOR_LEGACY to
> DRM_MINOR_PRIMARY (to match the actual struct-member name).
>
> Furthermore, this is in no way a legacy node, so lets not call it that.
>
> Signed-off-by: David Herrmann <dh.herrmann at gmail.com>
Reviewed-by: Frank Binns <frank.binns at imgtec.com>
> ---
> drivers/gpu/drm/drm_drv.c | 14 +++++++-------
> include/drm/drmP.h | 4 ++--
> 2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index be27ed3..57ce973 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -112,7 +112,7 @@ static struct drm_minor **drm_minor_get_slot(struct
> drm_device *dev,
> unsigned int type)
> {
> switch (type) {
> - case DRM_MINOR_LEGACY:
> + case DRM_MINOR_PRIMARY:
> return &dev->primary;
> case DRM_MINOR_RENDER:
> return &dev->render;
> @@ -512,7 +512,7 @@ int drm_dev_init(struct drm_device *dev,
> goto err_minors;
> }
>
> - ret = drm_minor_alloc(dev, DRM_MINOR_LEGACY);
> + ret = drm_minor_alloc(dev, DRM_MINOR_PRIMARY);
> if (ret)
> goto err_minors;
>
> @@ -545,7 +545,7 @@ err_ctxbitmap:
> drm_legacy_ctxbitmap_cleanup(dev);
> drm_ht_remove(&dev->map_hash);
> err_minors:
> - drm_minor_free(dev, DRM_MINOR_LEGACY);
> + drm_minor_free(dev, DRM_MINOR_PRIMARY);
> drm_minor_free(dev, DRM_MINOR_RENDER);
> drm_minor_free(dev, DRM_MINOR_CONTROL);
> drm_fs_inode_free(dev->anon_inode);
> @@ -608,7 +608,7 @@ static void drm_dev_release(struct kref *ref)
> drm_ht_remove(&dev->map_hash);
> drm_fs_inode_free(dev->anon_inode);
>
> - drm_minor_free(dev, DRM_MINOR_LEGACY);
> + drm_minor_free(dev, DRM_MINOR_PRIMARY);
> drm_minor_free(dev, DRM_MINOR_RENDER);
> drm_minor_free(dev, DRM_MINOR_CONTROL);
>
> @@ -684,7 +684,7 @@ int drm_dev_register(struct drm_device *dev, unsigned
> long flags)
> if (ret)
> goto err_minors;
>
> - ret = drm_minor_register(dev, DRM_MINOR_LEGACY);
> + ret = drm_minor_register(dev, DRM_MINOR_PRIMARY);
> if (ret)
> goto err_minors;
>
> @@ -701,7 +701,7 @@ int drm_dev_register(struct drm_device *dev, unsigned
> long flags)
> goto out_unlock;
>
> err_minors:
> - drm_minor_unregister(dev, DRM_MINOR_LEGACY);
> + drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
> drm_minor_unregister(dev, DRM_MINOR_RENDER);
> drm_minor_unregister(dev, DRM_MINOR_CONTROL);
> out_unlock:
> @@ -741,7 +741,7 @@ void drm_dev_unregister(struct drm_device *dev)
> list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
> drm_legacy_rmmap(dev, r_list->map);
>
> - drm_minor_unregister(dev, DRM_MINOR_LEGACY);
> + drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
> drm_minor_unregister(dev, DRM_MINOR_RENDER);
> drm_minor_unregister(dev, DRM_MINOR_CONTROL);
> }
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index d377865..d488a72 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -642,7 +642,7 @@ struct drm_driver {
> };
>
> enum drm_minor_type {
> - DRM_MINOR_LEGACY,
> + DRM_MINOR_PRIMARY,
> DRM_MINOR_CONTROL,
> DRM_MINOR_RENDER,
> DRM_MINOR_CNT,
> @@ -856,7 +856,7 @@ static inline bool drm_is_control_client(const struct
> drm_file *file_priv)
>
> static inline bool drm_is_primary_client(const struct drm_file *file_priv)
> {
> - return file_priv->minor->type == DRM_MINOR_LEGACY;
> + return file_priv->minor->type == DRM_MINOR_PRIMARY;
> }
>
> /******************************************************************/
