From patchwork Fri Jan 26 11:30:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Engestrom X-Patchwork-Id: 10185451 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C4F80603ED for ; Fri, 26 Jan 2018 11:31:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD70A290F6 for ; Fri, 26 Jan 2018 11:31:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1BF32911B; Fri, 26 Jan 2018 11:31:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A8382911B for ; Fri, 26 Jan 2018 11:31:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 687EC6E380; Fri, 26 Jan 2018 11:31:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by gabe.freedesktop.org (Postfix) with ESMTP id F2D7F6E20A for ; Fri, 26 Jan 2018 11:31:50 +0000 (UTC) Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Forcepoint Email with ESMTPS id 7D5362DA548B8 for ; Fri, 26 Jan 2018 11:31:46 +0000 (GMT) Received: from localhost.localdomain (10.60.4.28) by HHMAIL01.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.361.1; Fri, 26 Jan 2018 11:31:49 +0000 From: Eric Engestrom To: Subject: [PATCH libdrm 2/7] nouveau: remove always-true #ifdef guards Date: Fri, 26 Jan 2018 11:30:42 +0000 Message-ID: <20180126113047.25658-2-eric.engestrom@imgtec.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180126113047.25658-1-eric.engestrom@imgtec.com> References: <20180126113047.25658-1-eric.engestrom@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.60.4.28] X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP `DEBUG` has always been defined since 292da616fe1f936ca78a3 "nouveau: pull in major libdrm rewrite" in 2011 Signed-off-by: Eric Engestrom --- nouveau/Makefile.am | 3 +-- nouveau/nouveau.c | 4 ---- nouveau/private.h | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 344a84454e420044afb5..60ebe243d4236e6aa814 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -4,8 +4,7 @@ AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm \ - -DDEBUG + -I$(top_srcdir)/include/drm libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la libdrm_nouveau_ladir = $(libdir) diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c index e113a8fe780757a096b2..e68de16fe42c1953e9c0 100644 --- a/nouveau/nouveau.c +++ b/nouveau/nouveau.c @@ -50,7 +50,6 @@ #include "nvif/ioctl.h" #include "nvif/unpack.h" -#ifdef DEBUG drm_private uint32_t nouveau_debug = 0; static void @@ -62,7 +61,6 @@ debug_init(char *args) nouveau_debug = n; } } -#endif static int nouveau_object_ioctl(struct nouveau_object *obj, void *data, uint32_t size) @@ -331,9 +329,7 @@ nouveau_drm_new(int fd, struct nouveau_drm **pdrm) struct nouveau_drm *drm; drmVersionPtr ver; -#ifdef DEBUG debug_init(getenv("NOUVEAU_LIBDRM_DEBUG")); -#endif if (!(drm = calloc(1, sizeof(*drm)))) return -ENOMEM; diff --git a/nouveau/private.h b/nouveau/private.h index 83060f965244fac3f087..8eca0a067195d7c5c54c 100644 --- a/nouveau/private.h +++ b/nouveau/private.h @@ -9,17 +9,12 @@ #include "nouveau.h" -#ifdef DEBUG drm_private uint32_t nouveau_debug; #define dbg_on(lvl) (nouveau_debug & (1 << lvl)) #define dbg(lvl, fmt, args...) do { \ if (dbg_on((lvl))) \ fprintf(stderr, "nouveau: "fmt, ##args); \ } while(0) -#else -#define dbg_on(lvl) (0) -#define dbg(lvl, fmt, args...) -#endif #define err(fmt, args...) fprintf(stderr, "nouveau: "fmt, ##args) struct nouveau_client_kref {