From patchwork Thu Apr 19 15:59:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 10351215 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 761B76053C for ; Thu, 19 Apr 2018 16:24:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64E9828AE7 for ; Thu, 19 Apr 2018 16:24:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5989428AE9; Thu, 19 Apr 2018 16:24:03 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 EB88528AE7 for ; Thu, 19 Apr 2018 16:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753811AbeDSQYC (ORCPT ); Thu, 19 Apr 2018 12:24:02 -0400 Received: from gateway33.websitewelcome.com ([192.185.146.85]:31883 "EHLO gateway33.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753609AbeDSQYB (ORCPT ); Thu, 19 Apr 2018 12:24:01 -0400 X-Greylist: delayed 1440 seconds by postgrey-1.27 at vger.kernel.org; Thu, 19 Apr 2018 12:24:01 EDT Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway33.websitewelcome.com (Postfix) with ESMTP id D716420305B9 for ; Thu, 19 Apr 2018 10:59:59 -0500 (CDT) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id 9ByZfywox6il39ByZf0YK2; Thu, 19 Apr 2018 10:59:59 -0500 X-Authority-Reason: nr=8 Received: from [189.175.6.211] (port=41278 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.89_1) (envelope-from ) id 1f9ByZ-003SB0-FH; Thu, 19 Apr 2018 10:59:59 -0500 Date: Thu, 19 Apr 2018 10:59:58 -0500 From: "Gustavo A. R. Silva" To: Masahiro Yamada , Adrian Hunter , Ulf Hansson Cc: linux-mmc , Linux Kernel Mailing List , "Gustavo A. R. Silva" Subject: [PATCH v2] mmc: sdhci-cadence: fix logically and structurally dead code Message-ID: <20180419155958.GA18593@embeddedor.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.175.6.211 X-Source-L: No X-Exim-ID: 1f9ByZ-003SB0-FH X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.175.6.211]:41278 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 9 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, the code block inside the for loop will never execute more than once, because the function returns inmediately after the first iteration, hence the execution of the code at the second iteration is structurally dead and, code at line 281: return 0; is never reached. Fix this by checking _ret_ before return. Addresses-Coverity-ID: 1468009 ("Logically dead code") Addresses-Coverity-ID: 1468002 ("Structurally dead code") Suggested-by: Masahiro Yamada Signed-off-by: Gustavo A. R. Silva Acked-by: Masahiro Yamada Acked-by: Adrian Hunter --- Changes in v2: - Update changelog. - Drop the 'Fixes' tag. - Add check on ret instead of removing the "return ret;" line. - Thanks to Masahiro Yamada for the feedback provided. drivers/mmc/host/sdhci-cadence.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c index bc30d16..7a343b8 100644 --- a/drivers/mmc/host/sdhci-cadence.c +++ b/drivers/mmc/host/sdhci-cadence.c @@ -274,8 +274,8 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) ret = readl_poll_timeout(reg, tmp, !(tmp & SDHCI_CDNS_HRS06_TUNE_UP), 0, 1); - - return ret; + if (ret) + return ret; } return 0;