From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 914265F0F for ; Tue, 30 Apr 2019 16:03:59 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Apr 2019 07:03:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,413,1549958400"; d="scan'208";a="295794145" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by orsmga004.jf.intel.com with ESMTP; 30 Apr 2019 07:03:43 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 30 Apr 2019 15:03:25 +0100 Message-Id: <20190430140325.45537-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190430140325.45537-1-bruce.richardson@intel.com> References: <20190430140325.45537-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 19.08 3/3] kernel/linux: remove unneeded local variables X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2019 14:04:00 -0000 The local variables for the error message aren't needed, since the messages aren't used more than once, and the indent levels are now such that the lines printing the message are not much longer than the lines defining the variables to hold the messages themselves. Therefore the use of the variables is pointless. Signed-off-by: Bruce Richardson --- kernel/linux/meson.build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index d31fc8f80..a37c95752 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -3,12 +3,9 @@ subdirs = ['igb_uio', 'kni'] -WARN_CROSS_COMPILE='Need "kernel_dir" option for kmod compilation when cross-compiling' -WARN_NO_HEADERS='Cannot compile kernel modules as requested - are kernel headers installed?' - # if we are cross-compiling we need kernel_dir specified if get_option('kernel_dir') == '' and meson.is_cross_build() - warning(WARN_CROSS_COMPILE) + warning('Need "kernel_dir" option for kmod compilation when cross-compiling') subdir_done() endif @@ -23,7 +20,7 @@ endif make_returncode = run_command('make', '-sC', kernel_dir, 'kernelversion').returncode() if make_returncode != 0 - warning(WARN_NO_HEADERS) + warning('Cannot compile kernel modules as requested - are kernel headers installed?') subdir_done() endif -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id E3619A0679 for ; Tue, 30 Apr 2019 16:04:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 80FF85F1F; Tue, 30 Apr 2019 16:04:04 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 914265F0F for ; Tue, 30 Apr 2019 16:03:59 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Apr 2019 07:03:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,413,1549958400"; d="scan'208";a="295794145" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by orsmga004.jf.intel.com with ESMTP; 30 Apr 2019 07:03:43 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 30 Apr 2019 15:03:25 +0100 Message-Id: <20190430140325.45537-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190430140325.45537-1-bruce.richardson@intel.com> References: <20190430140325.45537-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 19.08 3/3] kernel/linux: remove unneeded local variables X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190430140325.IkK80iJ4lKfkm7yJDA4Y16dkXRAL_bCIrduOMAHVIu8@z> The local variables for the error message aren't needed, since the messages aren't used more than once, and the indent levels are now such that the lines printing the message are not much longer than the lines defining the variables to hold the messages themselves. Therefore the use of the variables is pointless. Signed-off-by: Bruce Richardson --- kernel/linux/meson.build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index d31fc8f80..a37c95752 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -3,12 +3,9 @@ subdirs = ['igb_uio', 'kni'] -WARN_CROSS_COMPILE='Need "kernel_dir" option for kmod compilation when cross-compiling' -WARN_NO_HEADERS='Cannot compile kernel modules as requested - are kernel headers installed?' - # if we are cross-compiling we need kernel_dir specified if get_option('kernel_dir') == '' and meson.is_cross_build() - warning(WARN_CROSS_COMPILE) + warning('Need "kernel_dir" option for kmod compilation when cross-compiling') subdir_done() endif @@ -23,7 +20,7 @@ endif make_returncode = run_command('make', '-sC', kernel_dir, 'kernelversion').returncode() if make_returncode != 0 - warning(WARN_NO_HEADERS) + warning('Cannot compile kernel modules as requested - are kernel headers installed?') subdir_done() endif -- 2.20.1