From patchwork Tue May 16 13:24:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arkadiusz Hiler X-Patchwork-Id: 9729199 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 49A06602B4 for ; Tue, 16 May 2017 13:25:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 333B428653 for ; Tue, 16 May 2017 13:25:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2644628A23; Tue, 16 May 2017 13:25:28 +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 ABDBC28653 for ; Tue, 16 May 2017 13:25:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 58CDA6E0CB; Tue, 16 May 2017 13:25:24 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCE586E0CB for ; Tue, 16 May 2017 13:25:23 +0000 (UTC) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP; 16 May 2017 06:25:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,349,1491289200"; d="scan'208";a="87981565" Received: from ahiler-desk.igk.intel.com ([172.28.171.131]) by orsmga004.jf.intel.com with ESMTP; 16 May 2017 06:25:22 -0700 From: Arkadiusz Hiler To: intel-gfx@lists.freedesktop.org Date: Tue, 16 May 2017 15:24:51 +0200 Message-Id: <20170516132502.9772-3-arkadiusz.hiler@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170516132502.9772-1-arkadiusz.hiler@intel.com> References: <20170516132502.9772-1-arkadiusz.hiler@intel.com> Organization: Intel Technology Poland sp. z o.o. - KRS 101882 - ul. Slowackiego 173, 80-298 Gdansk Subject: [Intel-gfx] [PATCH i-g-t 02/13] Make conditions on HAVE_UDEV consistent X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP We have a lot of `#ifdef HAVE_UDEV` and ` #if HAVE_UDEV` all over the place, but ifdef and if have a slightly different semantics. Let make it consistent by using #ifdefs only. Signed-off-by: Arkadiusz Hiler --- lib/igt_aux.c | 2 +- tests/testdisplay_hotplug.c | 2 +- tools/intel_l3_parity.c | 2 +- tools/intel_l3_parity.h | 2 +- tools/intel_l3_udev_listener.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/igt_aux.c b/lib/igt_aux.c index 1222806..2ec6b78 100644 --- a/lib/igt_aux.c +++ b/lib/igt_aux.c @@ -388,7 +388,7 @@ void igt_stop_shrink_helper(void) igt_stop_helper(&shrink_helper); } -#if HAVE_UDEV +#ifdef HAVE_UDEV #include static struct igt_helper_process hang_detector; diff --git a/tests/testdisplay_hotplug.c b/tests/testdisplay_hotplug.c index 3b900ca..cf15511 100644 --- a/tests/testdisplay_hotplug.c +++ b/tests/testdisplay_hotplug.c @@ -34,7 +34,7 @@ #endif -#if HAVE_UDEV +#ifdef HAVE_UDEV #include static struct udev_monitor *uevent_monitor; static struct udev *udev; diff --git a/tools/intel_l3_parity.c b/tools/intel_l3_parity.c index dce7f32..eb00c50 100644 --- a/tools/intel_l3_parity.c +++ b/tools/intel_l3_parity.c @@ -42,7 +42,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#if HAVE_UDEV +#ifdef HAVE_UDEV #include #include #endif diff --git a/tools/intel_l3_parity.h b/tools/intel_l3_parity.h index 65697c4..759c4f4 100644 --- a/tools/intel_l3_parity.h +++ b/tools/intel_l3_parity.h @@ -18,7 +18,7 @@ struct l3_location { uint8_t subbank; }; -#if HAVE_UDEV +#ifdef HAVE_UDEV int l3_uevent_setup(struct l3_parity *par); /* Listens (blocks) for an l3 parity event. Returns the location of the error. */ int l3_listen(struct l3_parity *par, bool daemon, struct l3_location *loc); diff --git a/tools/intel_l3_udev_listener.c b/tools/intel_l3_udev_listener.c index 0b94c1c..270bfff 100644 --- a/tools/intel_l3_udev_listener.c +++ b/tools/intel_l3_udev_listener.c @@ -25,7 +25,7 @@ #include "config.h" #endif -#if HAVE_UDEV +#ifdef HAVE_UDEV #include #ifndef _GNU_SOURCE #define _GNU_SOURCE