From patchwork Fri Feb 6 10:16:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Ruprecht X-Patchwork-Id: 5798021 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C817DBF6C3 for ; Mon, 9 Feb 2015 01:36:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18A3C2020F for ; Mon, 9 Feb 2015 01:36:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BA6E92021F for ; Mon, 9 Feb 2015 01:36:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E8906E321; Sun, 8 Feb 2015 17:36:45 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F5E37A012 for ; Fri, 6 Feb 2015 02:17:03 -0800 (PST) Received: by mail-wi0-f178.google.com with SMTP id bs8so1216528wib.5 for ; Fri, 06 Feb 2015 02:17:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3+c/REPR+x+u8pAY783Os7vthk1xes5bhXP1t24vmAQ=; b=Y3TKbVChMC+g/7IUqA5qBftSWOQe4k9GQFaHKiVR9+Db8Jr/wd0HzVB2qh0px/8wyQ 8OVo0OCeceG2s3YCTQuu/RHMm5KhOHX5Zbkz6k7Z6zkBQEck7DuV1Ty8yGFcED7PDrgL WssH0Y95pxusk04cKXL7wGwZc9Org1mG2u1wM4jAPzuCD+AhfFmhTQOmrUT1QeneenJU cc3TA8p/KYFiGMFtqtyy8w426U4gVUZAnvwjEhzRDSL6jg26PZl6K9ppr/mGb9u4mRZ3 ZmkyJGSx5lunCvvcgZ8f9Xgq1Tx+Gjx5eY/R6QzMV0mZ2+K0AmnOOk+jGYsq9umzeD5w UrSg== X-Gm-Message-State: ALoCoQkG5VssLqUERLHUDYqsdUtCwSQ8PjD8QrrL+mi2dft7/t4bkKFj1+VDoWvReXMVXlYqw28t X-Received: by 10.180.98.136 with SMTP id ei8mr1760701wib.9.1423217822338; Fri, 06 Feb 2015 02:17:02 -0800 (PST) Received: from faui49t.informatik.uni-erlangen.de (faui49t.informatik.uni-erlangen.de. [131.188.42.17]) by mx.google.com with ESMTPSA id n3sm2667715wja.36.2015.02.06.02.17.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Feb 2015 02:17:01 -0800 (PST) From: Andreas Ruprecht To: David Airlie Subject: [PATCH] drm/i915: Remove references to previously removed UMS config option Date: Fri, 6 Feb 2015 11:16:47 +0100 Message-Id: <1423217807-13936-1-git-send-email-rupran@einserver.de> X-Mailer: git-send-email 1.9.1 X-Mailman-Approved-At: Sun, 08 Feb 2015 17:36:40 -0800 Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Andreas Ruprecht X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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"); 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); }