Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754848AbbBFKr5 (ORCPT ); Fri, 6 Feb 2015 05:47:57 -0500 Received: from mga01.intel.com ([192.55.52.88]:36439 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751551AbbBFKr4 (ORCPT ); Fri, 6 Feb 2015 05:47:56 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,529,1418112000"; d="scan'208";a="673810565" From: Jani Nikula To: Andreas Ruprecht , David Airlie Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Andreas Ruprecht Subject: Re: [PATCH] drm/i915: Remove references to previously removed UMS config option In-Reply-To: <1423217807-13936-1-git-send-email-rupran@einserver.de> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1423217807-13936-1-git-send-email-rupran@einserver.de> User-Agent: Notmuch/0.19+54~g59142f6 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Fri, 06 Feb 2015 12:48:57 +0200 Message-ID: <87oap7wc12.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2209 Lines: 69 On Fri, 06 Feb 2015, 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 > --- > 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"); I'm not sure if this logging change is required. UMS will still also be disabled. Or maybe make it "KMS disabled, UMS not supported.\n". Background in commit c9cd7b65db50175a5f1ff64bbad6d5affdad6aba Author: Jani Nikula Date: Mon Jun 2 16:58:30 2014 +0300 drm/i915: tell the user if both KMS and UMS are disabled Other than that, Reviewed-by: Jani Nikula > 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); > } > -- > 1.9.1 > -- Jani Nikula, Intel Open Source Technology Center -- 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/