Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752175AbbBFKaR (ORCPT ); Fri, 6 Feb 2015 05:30:17 -0500 Received: from cpsmtpb-ews10.kpnxchange.com ([213.75.39.15]:54199 "EHLO cpsmtpb-ews10.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751182AbbBFKaP (ORCPT ); Fri, 6 Feb 2015 05:30:15 -0500 Message-ID: <1423218613.32511.20.camel@x220> Subject: Re: [PATCH] drm/i915: Remove references to previously removed UMS config option From: Paul Bolle To: Andreas Ruprecht Cc: David Airlie , Daniel Vetter , Jani Nikula , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Fri, 06 Feb 2015 11:30:13 +0100 In-Reply-To: <1423217807-13936-1-git-send-email-rupran@einserver.de> References: <1423217807-13936-1-git-send-email-rupran@einserver.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4 (3.10.4-4.fc20) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 06 Feb 2015 10:30:14.0665 (UTC) FILETIME=[E4E47790:01D041F7] X-RcptDomain: vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2085 Lines: 64 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 > --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/