hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Commit 03dae59c72 ("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>
This commit is contained in:
Andreas Ruprecht 2015-02-06 11:16:47 +01:00 committed by Daniel Vetter
parent a86eb582e3
commit cd5956c913
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_drv.c
View File

@ -1651,11 +1651,9 @@ static int __init i915_init(void)
if (!(driver.driver_features & DRIVER_MODESET)) { if (!(driver.driver_features & DRIVER_MODESET)) {
driver.get_vblank_timestamp = NULL; driver.get_vblank_timestamp = NULL;
#ifndef CONFIG_DRM_I915_UMS
/* Silently fail loading to not upset userspace. */ /* Silently fail loading to not upset userspace. */
DRM_DEBUG_DRIVER("KMS and UMS disabled.\n"); DRM_DEBUG_DRIVER("KMS and UMS disabled.\n");
return 0; return 0;
#endif
} }
/* /*
@ -1671,10 +1669,8 @@ static int __init i915_init(void)
static void __exit i915_exit(void) static void __exit i915_exit(void)
{ {
#ifndef CONFIG_DRM_I915_UMS
if (!(driver.driver_features & DRIVER_MODESET)) if (!(driver.driver_features & DRIVER_MODESET))
return; /* Never loaded a driver. */ return; /* Never loaded a driver. */
#endif
drm_pci_exit(&driver, &i915_pci_driver); drm_pci_exit(&driver, &i915_pci_driver);
} }