From patchwork Sat Dec 10 22:05:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 32101 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1512477wrr; Sat, 10 Dec 2022 14:10:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf49PQNvJvkrBv8GH9bEM345v8qjZ2sSnE3z7kXGZbwQoVmxYLOv8eX7M6ftW/LA1c3hufCc X-Received: by 2002:aa7:96fc:0:b0:577:fdb8:e601 with SMTP id i28-20020aa796fc000000b00577fdb8e601mr6879316pfq.21.1670710216253; Sat, 10 Dec 2022 14:10:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670710216; cv=none; d=google.com; s=arc-20160816; b=yr+1922bFdvPCV9w6qh4CrK2MZADwrx1RxvfbJIzN1D+oE0jIDq6MboVs/cbMAqV7a Ydh66zaIMFxjaoQr35/IYA9SP09aQv/36EpqoLKoDUR1fcVc9S3VNp7AGoeAb7Kv4dxO s46tJlnSPHKeMfpW6qj3uktn4YJdrRGp0DSeIYeFkq/RCZfG6BwIb/7uEECODEnX9MMV stb7ON9uMQkLgN/0jSzj6D5fFKR25OG6LfUt4irUrK0BpqJisB5JHb72KoTZeolMsSxF OQEml/Uqlu+f2wd4psMHKG1qN409lvi70htjaMtVkIjcAEwZ6zbDVNowHeo+p5Rzw6h/ dOhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cUEhTrtcroSdMsr9hHcEhiv/dGaU/bEp1yiGKHAT0MU=; b=k+R3BNDY4j6haepKC6gSJp7rjbxCXBNVezUTEq86WeH8AVFPGBXmEhtzYVmy7Rt4hV jrjCr9QghgWWFLcBRJHIK9/V/UL7Qq9/WrknYvdI36w4YbP6GqF8ymdPrBwvXUWnTBSU sQ46VBFCMSndtaysEK4LwCxBG0nDg7TWvZyPUVMuktLsju5dyjxgwaBpPiySkl3OMs7D 1NeuSzfBKrzFVRxj+/Mn2PYDV3s5AxE+34Chf6ei0UgXwpBAhwnixOBOFGjIhDd+9QqU 2Ee/P89vUW7Nowuxnmat6tf4n2IF1sLZtkcCGoLWw6W47oVdZ745de1akDWMN+CnaTnP TnLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Mcd3mho+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y13-20020a056a00180d00b00576caf113acsi6053040pfa.8.2022.12.10.14.10.03; Sat, 10 Dec 2022 14:10:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Mcd3mho+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229896AbiLJWGE (ORCPT + 99 others); Sat, 10 Dec 2022 17:06:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229847AbiLJWFk (ORCPT ); Sat, 10 Dec 2022 17:05:40 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1599613D4F; Sat, 10 Dec 2022 14:05:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670709940; x=1702245940; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vkrxbHg3Pwn+h3sN0NMmjjLRRztZhfqgXCcqyghgbqc=; b=Mcd3mho+wz+ydv/W/CsTnxSVtDLUSfQA5Tb8F+QNAcRF9pw8e5fKGXne OVTxQO7eDL9zBLWHMjpRfYj3xvZkrWG05brxzdOSAHx2DUjISf5qeT6b7 FbrlZhjI9jQBuI6gStl5g14q3rXQof/ER/J2qz9mLuRYcy9nMz6pHzsky vhafIpcKq5tKIUIeuX3SeTHBtbmG4IPiPm96tRQxuWf37ekzIlYu3lsz3 PJFWq1p8n7/MiQS/DMnS6aFHyUkf6koTGZHOzhe1nLVW+n9NT6pIkrejW f3F73N4cs04ZnGsYPjtaFjOWYaZGC+OlKQe1krWv8V7mhPT9jqXipji3D A==; X-IronPort-AV: E=McAfee;i="6500,9779,10557"; a="403907181" X-IronPort-AV: E=Sophos;i="5.96,235,1665471600"; d="scan'208";a="403907181" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2022 14:05:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10557"; a="625470514" X-IronPort-AV: E=Sophos;i="5.96,235,1665471600"; d="scan'208";a="625470514" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 10 Dec 2022 14:05:36 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4FB9BF7; Sun, 11 Dec 2022 00:06:05 +0200 (EET) From: Andy Shevchenko To: Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Bartosz Golaszewski , Haibo Chen , Andy Shevchenko Subject: [PATCH v2 2/4] gpio: pca953x: avoid logically dead code Date: Sun, 11 Dec 2022 00:05:59 +0200 Message-Id: <20221210220601.77648-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221210220601.77648-1-andriy.shevchenko@linux.intel.com> References: <20221210220601.77648-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751866635981888072?= X-GMAIL-MSGID: =?utf-8?q?1751866635981888072?= From: Haibo Chen The current code logic make the condition "else if (reg >= 0x54)" can't be true, cause the dead code. So fix it to match the coder expectation. This is reported by Coverity. Fixes: 13c5d4ce8060 ("gpio: pca953x: Add support for PCAL6534") Signed-off-by: Haibo Chen Signed-off-by: Andy Shevchenko --- v2: shuffled code to check bigger value first (Andy) drivers/gpio/gpio-pca953x.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 5299e5bb76d6..2c8586b3191f 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -309,26 +309,26 @@ static bool pcal6534_check_register(struct pca953x_chip *chip, unsigned int reg, int bank; int offset; - if (reg >= 0x30) { + if (reg >= 0x54) { /* - * Reserved block between 14h and 2Fh does not align on - * expected bank boundaries like other devices. + * Handle lack of reserved registers after output port + * configuration register to form a bank. */ - int temp = reg - 0x30; + int temp = reg - 0x54; bank = temp / NBANK(chip); offset = temp - (bank * NBANK(chip)); - bank += 8; - } else if (reg >= 0x54) { + bank += 16; + } else if (reg >= 0x30) { /* - * Handle lack of reserved registers after output port - * configuration register to form a bank. + * Reserved block between 14h and 2Fh does not align on + * expected bank boundaries like other devices. */ - int temp = reg - 0x54; + int temp = reg - 0x30; bank = temp / NBANK(chip); offset = temp - (bank * NBANK(chip)); - bank += 16; + bank += 8; } else { bank = reg / NBANK(chip); offset = reg - (bank * NBANK(chip));