[PATCH] drm/i915: Remove references to previously removed UMS config option

[Paul Bolle]

On Fri, 2015-02-06 at 11:16 +0100, Andreas Ruprecht wrote:
> Commit 03dae59c72ffffd8 ("drm/i915: Ditch UMS config option") removed
> CONFIG_DRM_I915_UMS from the Kconfig file, but i915_drv.c still
> references this option in two #ifndef statements.
> 
> As an undefined config option will always be 'false', we can drop
> the #ifndefs alltogether and adapt the printed error message.
> 
> This inconsistency was found with the undertaker tool.
> 
> Signed-off-by: Andreas Ruprecht <rupran at einserver.de>
> ---

Previously discussed in
http://lists.freedesktop.org/archives/dri-devel/2014-July/064702.html
(but not on lkml). If I understand Daniels message correctly this
    $ git grep -n '!drm_core_check_feature' | grep -w DRIVER_MODESET | wc -l
    43

means the cleanup needed to be done before this cleanup will be applied,
hasn't happened yet.

>  drivers/gpu/drm/i915/i915_drv.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 8039cec..4ecf85f 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1630,11 +1630,9 @@ static int __init i915_init(void)
>  
>  	if (!(driver.driver_features & DRIVER_MODESET)) {
>  		driver.get_vblank_timestamp = NULL;
> -#ifndef CONFIG_DRM_I915_UMS
>  		/* Silently fail loading to not upset userspace. */
> -		DRM_DEBUG_DRIVER("KMS and UMS disabled.\n");
> +		DRM_DEBUG_DRIVER("KMS disabled.\n");
>  		return 0;
> -#endif
>  	}
>  
>  	/*
> @@ -1650,10 +1648,8 @@ static int __init i915_init(void)
>  
>  static void __exit i915_exit(void)
>  {
> -#ifndef CONFIG_DRM_I915_UMS
>  	if (!(driver.driver_features & DRIVER_MODESET))
>  		return; /* Never loaded a driver. */
> -#endif
>  
>  	drm_pci_exit(&driver, &i915_pci_driver);
>  }

Thanks,


Paul Bolle