Commit cd5956c9 authored Feb 06, 2015 by Andreas Ruprecht Committed by Daniel Vetter Feb 13, 2015

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



Commit 03dae59c ("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@einserver.de>
[danvet: Undo logging change as requested by Jani.]
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent a86eb582

drivers/gpu/drm/i915/i915_drv.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1651,11 +1651,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");
		return 0;
		#endif
		}

		/*
		@@ -1671,10 +1669,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);
		}