From patchwork Sat Oct 21 20:11:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10021499 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 C681C60224 for ; Sat, 21 Oct 2017 20:12:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92DC02823D for ; Sat, 21 Oct 2017 20:12:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85FA0285A2; Sat, 21 Oct 2017 20:12:16 +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 3B04E2823D for ; Sat, 21 Oct 2017 20:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932241AbdJUUMC (ORCPT ); Sat, 21 Oct 2017 16:12:02 -0400 Received: from mout.web.de ([212.227.15.14]:53905 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932202AbdJUUMB (ORCPT ); Sat, 21 Oct 2017 16:12:01 -0400 Received: from [192.168.1.2] ([78.49.207.83]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MbMg8-1dpZhG3rV6-00ImyY; Sat, 21 Oct 2017 22:11:39 +0200 To: linux-integrity@vger.kernel.org, Jarkko Sakkinen , Jason Gunthorpe , =?UTF-8?Q?Peter_H=c3=bcwe?= Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] tpm_i2c_nuvoton: Use common error handling code in i2c_nuvoton_send() Message-ID: <6d2dcc64-af7a-fb71-f863-10d30914269e@users.sourceforge.net> Date: Sat, 21 Oct 2017 22:11:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-GB X-Provags-ID: V03:K0:zxMXDzdt2frbX7ukX3LUecjeTCGMZc51jNV4wyYnAgWPYf+ss0r AVo7PVLGQioS5w87oZsa2AmmHiPAYfeXNdxn8L8eHKdDHz+d1YABa7wNh36OgThbzkdWRzV xJ4PfjPrZidCQuz4x6prDjmOZo/bIa07P9Yd+xe6qAkp2WNl6xzz7fsKB9afHPBqCeJO5yp cVqeCoLX1y43hAdxhSELg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Sr1zptUafeo=:UBWxyb4FMdmRdCaXSC948o 1mzpTPQ9SFKzdQUCgIjxo6cLbrRopCXyP9TXnumICXj2LdpeDULSSeV+9Q0HpXvuACKJpOY11 fQ6G4UkvkMBAeYl6L0wdBtT3u9SmMIJ0ET2/im6nxK/fcu1xDMHJaMn6aE5qWFx3Kb+k9ifb/ kUqy3tjyDsu+WC6JTP5zbG3zzELfaWZPbD1lSG9ELbHImqiBQqckQOtmvDhMQ2NzaBpz69F61 rlxPfNWq7suVg6Ub3lCdtldnVd6sqmZanGfdFExRKluXMs7J2D6MC4tFf+2qUVk0NCY238A6w Fw4i+UxKOoqkqihGJCd2KUpkC31MXWq5T9EktdAYRCMstct8Qo0hgYR4CfnX/18R6qQg8d6pt Eg/dT7IiOzCmy/N/DapOONIff/9ueZT0SD8uFHCrO/KdcrtDWDfrb/m2GzsmfulqPMsme2gfI flDZUyaNcGbH4/+X9yZ0E4sy9emmaEYuXLSX8CKdYAWTQ1UQlNJ3WxdxjeT8jvSYGB7r5ngI1 rqar3qC9P+x2bl9lKYVep6m+5g7tk1HCNSAfbrmIrFSEv5fUuz1V5/VTiiGvTrUVKXmTez4IJ qE6yuj3lH2SD+TSFqsGqEzXHmR1DBcBJQy8o9xDe3DIcSiLve0tc18Y8r3RqUqMnZAh8ukFlF 4BOQkLza0neR13Bt4MKV9BCFg1ReSKdXgqfYD4QcZKxOkfgdEyy8qWCadma4mfdcOWH6hkcuB qlww6bKlIpHoDvXwdhdDI1Yx3VPk6onyBuWbkIvQqNLC23ELt0bYPm7sWI5EeaoFggYkeTew8 ALZsiXGxTov4DBtSpcwDeEsFnnNmePVtADv8Nblw6AJA8OM9vY= Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sat, 21 Oct 2017 22:07:39 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/char/tpm/tpm_i2c_nuvoton.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c index c6428771841f..f0037e9e2d0e 100644 --- a/drivers/char/tpm/tpm_i2c_nuvoton.c +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c @@ -440,15 +440,13 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 *buf, size_t len) } if (rc < 0) { /* retries == TPM_RETRY */ - i2c_nuvoton_ready(chip); - return rc; + goto write_ready; } /* execute the TPM command */ rc = i2c_nuvoton_write_status(client, TPM_STS_GO); if (rc < 0) { dev_err(dev, "%s() fail to write Go\n", __func__); - i2c_nuvoton_ready(chip); - return rc; + goto write_ready; } ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); rc = i2c_nuvoton_wait_for_data_avail(chip, @@ -457,12 +455,15 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 *buf, size_t len) &priv->read_queue); if (rc) { dev_err(dev, "%s() timeout command duration\n", __func__); - i2c_nuvoton_ready(chip); - return rc; + goto write_ready; } dev_dbg(dev, "%s() -> %zd\n", __func__, len); return len; + +write_ready: + i2c_nuvoton_ready(chip); + return rc; } static bool i2c_nuvoton_req_canceled(struct tpm_chip *chip, u8 status)