From patchwork Thu Jul 11 09:56:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 2826276 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A45319F756 for ; Thu, 11 Jul 2013 09:59:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5001201C7 for ; Thu, 11 Jul 2013 09:59:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D1948201C3 for ; Thu, 11 Jul 2013 09:59:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C384543683 for ; Thu, 11 Jul 2013 02:59:11 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 406F243683 for ; Thu, 11 Jul 2013 02:56:53 -0700 (PDT) Received: by mail-ee0-f43.google.com with SMTP id l10so5397341eei.2 for ; Thu, 11 Jul 2013 02:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=fa0QjQrCZCQOZpT1tzAkjGRdjxM/QlCjfZtoJB3FvgI=; b=tEakaGabfzL/e5Ge0s0I6msS/KyDPyjLOH9Exi5BqSt0B8TGpuLW2oKqr4p8jBsdrZ RO4JWm/AEgCx/wC+WlXQYF92EHn10D6FJdlS5hoUXmM1wkEbcFmIOD5sNgRrj/FTwzeC 1h2L1bnl7boXp/BJa6LXyR/13mJnMZep0kQZpRjLYzYkIfPw3y+ThpFBSMPQdzjxQiAp 1ETU6Xxj4cKkEv9Fxzex61tC9ovQYvjThHoEmrVbaBaLyBlWr88Ha1PzKeAB/xKWSIEt SZ1zsXrwqg2Y7zWsPkQOAbt1dSDeaCXptz9/rJvmjpGt+z/D/Z3pkTSJXw7G5N1ymNAn xwIw== X-Received: by 10.14.101.13 with SMTP id a13mr41159530eeg.86.1373536612456; Thu, 11 Jul 2013 02:56:52 -0700 (PDT) Received: from localhost.localdomain (stgt-5f71a97c.pool.mediaWays.net. [95.113.169.124]) by mx.google.com with ESMTPSA id i2sm67734838eeu.4.2013.07.11.02.56.50 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Jul 2013 02:56:51 -0700 (PDT) From: David Herrmann To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/pci: remove useles #if 1 Date: Thu, 11 Jul 2013 11:56:33 +0200 Message-Id: <1373536593-5617-2-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1373536593-5617-1-git-send-email-dh.herrmann@gmail.com> References: <1373536593-5617-1-git-send-email-dh.herrmann@gmail.com> Cc: Dave Airlie X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 These don't make any sense, really.. Signed-off-by: David Herrmann --- drivers/gpu/drm/drm_pci.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 80c0b2b..a7b46ff 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -52,10 +52,8 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align) { drm_dma_handle_t *dmah; -#if 1 unsigned long addr; size_t sz; -#endif /* pci_alloc_consistent only guarantees alignment to the smallest * PAGE_SIZE order which is greater than or equal to the requested size. @@ -97,10 +95,8 @@ EXPORT_SYMBOL(drm_pci_alloc); */ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) { -#if 1 unsigned long addr; size_t sz; -#endif if (dmah->vaddr) { /* XXX - Is virt_to_page() legal for consistent mem? */