From patchwork Wed Oct 4 15:56:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_B=C3=B6hmwalder?= X-Patchwork-Id: 9985007 X-Patchwork-Delegate: luca@coelho.fi 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 8534D6028E for ; Wed, 4 Oct 2017 15:58:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 784D928B45 for ; Wed, 4 Oct 2017 15:58:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D30B28B4A; Wed, 4 Oct 2017 15:58:18 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04E4028B45 for ; Wed, 4 Oct 2017 15:58:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751430AbdJDP5W convert rfc822-to-8bit (ORCPT ); Wed, 4 Oct 2017 11:57:22 -0400 Received: from zimbra.linuxprofi.at ([93.83.54.199]:33244 "EHLO zimbra.linuxprofi.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbdJDP5U (ORCPT ); Wed, 4 Oct 2017 11:57:20 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.linuxprofi.at (Postfix) with ESMTP id 72D95C623BE; Wed, 4 Oct 2017 16:34:40 +0200 (CEST) Received: from zimbra.linuxprofi.at ([127.0.0.1]) by localhost (zimbra.linuxprofi.at [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id KIp_REzAzxZd; Wed, 4 Oct 2017 16:34:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra.linuxprofi.at (Postfix) with ESMTP id 27343C626CC; Wed, 4 Oct 2017 16:34:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.linuxprofi.at Received: from zimbra.linuxprofi.at ([127.0.0.1]) by localhost (zimbra.linuxprofi.at [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id gmG0BLmZB52G; Wed, 4 Oct 2017 16:34:40 +0200 (CEST) Received: from localhost.localdomain (178.165.128.163.wireless.dyn.drei.com [178.165.128.163]) by zimbra.linuxprofi.at (Postfix) with ESMTPSA id 9C34EC6045B; Wed, 4 Oct 2017 16:34:39 +0200 (CEST) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: johannes.berg@intel.com, emmanuel.grumbach@intel.com, luciano.coelho@intel.com, kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= Subject: [PATCH 1/3] wireless: iwlwifi: use bool instead of int Date: Wed, 4 Oct 2017 17:56:58 +0200 Message-Id: <20171004155700.18048-2-christoph@boehmwalder.at> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171004155700.18048-1-christoph@boehmwalder.at> References: <20171004155700.18048-1-christoph@boehmwalder.at> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change a usage of int in a boolean context to use the bool type instead, as it makes the intent of the function clearer and helps clarify its semantics. Also eliminate the if/else and just return the boolean result directly, making the code more readable. Signed-off-by: Christoph Böhmwalder --- drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c index b7cd813ba70f..0eb815ae97e8 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c @@ -267,14 +267,12 @@ int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, } IWL_EXPORT_SYMBOL(iwl_phy_db_set_section); -static int is_valid_channel(u16 ch_id) +static bool is_valid_channel(u16 ch_id) { - if (ch_id <= 14 || - (36 <= ch_id && ch_id <= 64 && ch_id % 4 == 0) || - (100 <= ch_id && ch_id <= 140 && ch_id % 4 == 0) || - (145 <= ch_id && ch_id <= 165 && ch_id % 4 == 1)) - return 1; - return 0; + return (ch_id <= 14 || + (36 <= ch_id && ch_id <= 64 && ch_id % 4 == 0) || + (100 <= ch_id && ch_id <= 140 && ch_id % 4 == 0) || + (145 <= ch_id && ch_id <= 165 && ch_id % 4 == 1)); } static u8 ch_id_to_ch_index(u16 ch_id)