From patchwork Wed Apr 22 21:55:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 6258521 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F17849F389 for ; Wed, 22 Apr 2015 22:08:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2806C20361 for ; Wed, 22 Apr 2015 22:08:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3496420377 for ; Wed, 22 Apr 2015 22:08:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933599AbbDVWIZ (ORCPT ); Wed, 22 Apr 2015 18:08:25 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35493 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932540AbbDVWIX (ORCPT ); Wed, 22 Apr 2015 18:08:23 -0400 Received: by pabtp1 with SMTP id tp1so120973pab.2; Wed, 22 Apr 2015 15:08:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GxS7qUbXEOi8Z8s6hmE2zXeQObbv8suBLBT+bkrcTjY=; b=yqMwDbX53n4qiERlwJTqRLBsc+D/9weJCIBf8mTzlRYI/9VcwDVAYUxtLlkRiNS6bT zH+8QUlXuXCjH21Cro35tVwC9JgXR1lEM7AHq9wSqXQxbNXClm9ODOOAsj5sxAPQf8w6 Z8qmBdHGpgFyPFaM4ExEJV45TOwESoRNJqWuRYtvbCs+jeMqRwQ4Dhy/efOgyLf1ChS2 DwTovroUYi0Y8zdV5Y6Tus70d4nHJr2fIR9W9/GBahN85rjH9Hw42ibx4U82pKbELDYR 1aeAlsUfl8OvYOijLOMBMh+8AlK5pchkHj9jwUABVpv+AEleuR+6yUCYT/wDoec6gYdx RqEA== X-Received: by 10.66.172.4 with SMTP id ay4mr51590062pac.157.1429740502761; Wed, 22 Apr 2015 15:08:22 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id pv2sm5995190pbb.12.2015.04.22.15.08.20 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 Apr 2015 15:08:22 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 22 Apr 2015 15:06:12 -0700 From: "Luis R. Rodriguez" To: rusty@rustcorp.com.au Cc: akpm@linux-foundation.org, mingo@kernel.org, tj@kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, keescook@chromium.org, casey@schaufler-ca.com, cocci@systeme.lip6.fr, "Luis R. Rodriguez" , Jani Nikula Subject: [PATCH v2 5/8] kernel/workqueue.c: remove ifdefs over wq_power_efficient Date: Wed, 22 Apr 2015 14:55:08 -0700 Message-Id: <1429739711-9415-6-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1429739711-9415-1-git-send-email-mcgrof@do-not-panic.com> References: <1429739711-9415-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, TVD_SUBJ_WIPE_DEBT, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 From: "Luis R. Rodriguez" We can avoid an ifdef over wq_power_efficient's declaration by just using IS_ENABLED(). Cc: Rusty Russell Cc: Jani Nikula Cc: Andrew Morton Cc: Kees Cook Cc: Tejun Heo Cc: Ingo Molnar Cc: linux-kernel@vger.kernel.org Cc: cocci@systeme.lip6.fr Signed-off-by: Luis R. Rodriguez --- kernel/workqueue.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 586ad91..59bc249 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -280,12 +280,7 @@ static bool wq_disable_numa; module_param_named(disable_numa, wq_disable_numa, bool, 0444); /* see the comment above the definition of WQ_POWER_EFFICIENT */ -#ifdef CONFIG_WQ_POWER_EFFICIENT_DEFAULT -static bool wq_power_efficient = true; -#else -static bool wq_power_efficient; -#endif - +static bool wq_power_efficient = IS_ENABLED(CONFIG_WQ_POWER_EFFICIENT_DEFAULT); module_param_named(power_efficient, wq_power_efficient, bool, 0444); static bool wq_numa_enabled; /* unbound NUMA affinity enabled */