From patchwork Wed Jan 11 13:45:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 42006 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3331510wrt; Wed, 11 Jan 2023 05:52:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXvIgwIpbj8zkfawqr9l2q4bRd7lF2PxkLdApXhT1JlpipwO42/Wxi5LbM/ad7ecKagxdyF6 X-Received: by 2002:a05:6402:38a:b0:499:d239:29bd with SMTP id o10-20020a056402038a00b00499d23929bdmr3857028edv.5.1673445152221; Wed, 11 Jan 2023 05:52:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673445152; cv=none; d=google.com; s=arc-20160816; b=rBE0n+wKFEfOeRvJR97eP7LJFXGj6yqpqrJHLvTEnIWR2W/SrwExu7kjCUMLvlegIU Pi9++/3oWDD8CDde96cpc+N01aSDrCuHEC3ZfMVAVFfKWFp3OvLzk/TvKSMflL9vVg+q /z8ntRvlHSDmxprbccAJuTFpB/VLnvvFAtpqr/DT2vVJHfMYpue3Ch5CRugZ/VJG7fLO cswPSdRfglOl+RLLicTJqCgS/Z2ICu5A+Mae/qrRjKHwodSP+8n2sEfusXxn+RlZHHgx 0sFs/p8X3sPlZ29mo3yLgIz1UM4i6yonPCoNiDQVeJmwrLBofZRlkPUl4yoi2H0XLIOw GgSw== 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=hnikyNUGlyE4eEB9MaREVENYCjkmDJpN2cMJ7WqRqe4=; b=v3hDdBuqsGxhiBHIgmM2yle+X5vL/d1OMEnzUUqHjc01H7ndRgnX8V+B+Xujq9TQU+ H/U8jKnZ7LSXGMVbqAt399XuzxsAok/Req2ZsLzPOprTkObCE+znUlG0BOqwi+OnzWuL 04rUxE3JL7OWkKXh5dsQaqB2DBFNFuYaDVwn65CdrS4cQhHV5l4OaYlLBqBf2dUAiIfY AxaMxuGFC1wdnbw4pahN5xLAW3PpEvDA7IwK3uGUUx6HLslGM3xnWZ0T4GnKwcnSaa0R +XhaQS0kvbX1dcwL1BCw4XzaMIG1ocd3GsA1kNMdGTORLSYCY++C2a2iDQ55FhnssCfz LYeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b="HNgQT6/x"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id en14-20020a056402528e00b00499e590d47esi2337317edb.36.2023.01.11.05.52.08; Wed, 11 Jan 2023 05:52:32 -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=@microchip.com header.s=mchp header.b="HNgQT6/x"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239417AbjAKNqi (ORCPT + 99 others); Wed, 11 Jan 2023 08:46:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234525AbjAKNqV (ORCPT ); Wed, 11 Jan 2023 08:46:21 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 897C96377 for ; Wed, 11 Jan 2023 05:46:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1673444760; x=1704980760; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dqNf1ACM7VOxiqPM+Nc/J8oy1t3x6F1UdtTIb0rpr7I=; b=HNgQT6/xqaclpb6BB9Ms3IT/aqfWjwVaIw2SeWoG+7pJBAlm+XlfWRn5 b/wOm2xqlXW+DswFNVuvQ+WV4lF2w3MsEmN0erqf234Afo8L/F1Xo87eG v+t/GnPTBkxeAW0Y+gMxNq8m5OdLp/CjeNp8dSIOILV0wTAHzLKaXJBIv JHGtJiLnyLjWNpuOxs1sUSBG182yzWVmWJ0strW6QyEtvm9dNDcPOg/Ff sot3XpAY3dvfHmvF2mi3tkbaTXSyU3y/+I5k8auFunfQrODP6dNYmND7+ LnCe25E5VEHj6mXlcC83kXAoszQWtCvibXCOMIbHezUyumnpjLXqo3Eo4 w==; X-IronPort-AV: E=Sophos;i="5.96,317,1665471600"; d="scan'208";a="131834669" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 11 Jan 2023 06:45:56 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Wed, 11 Jan 2023 06:45:56 -0700 Received: from wendy.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Wed, 11 Jan 2023 06:45:55 -0700 From: Conor Dooley To: Jassi Brar CC: Conor Dooley , Daire McNamara , , Subject: [PATCH v1 6/7] soc: microchip: mpfs: simplify error handling in mpfs_blocking_transaction() Date: Wed, 11 Jan 2023 13:45:12 +0000 Message-ID: <20230111134513.2495510-7-conor.dooley@microchip.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111134513.2495510-1-conor.dooley@microchip.com> References: <20230111134513.2495510-1-conor.dooley@microchip.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS 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?1754734423642189612?= X-GMAIL-MSGID: =?utf-8?q?1754734423642189612?= The error handling has a kinda weird nested-if setup that is not really adding anything. Switch it to more of an early return arrangement as a predatory step for adding different handing for timeouts and failed services. Signed-off-by: Conor Dooley --- drivers/soc/microchip/mpfs-sys-controller.c | 28 ++++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c index 738ecd624d64..4aadd05769d2 100644 --- a/drivers/soc/microchip/mpfs-sys-controller.c +++ b/drivers/soc/microchip/mpfs-sys-controller.c @@ -32,28 +32,26 @@ struct mpfs_sys_controller { int mpfs_blocking_transaction(struct mpfs_sys_controller *sys_controller, struct mpfs_mss_msg *msg) { unsigned long timeout = msecs_to_jiffies(MPFS_SYS_CTRL_TIMEOUT_MS); - int ret, err; + int ret; - err = mutex_lock_interruptible(&transaction_lock); - if (err) - return err; + ret = mutex_lock_interruptible(&transaction_lock); + if (ret) + return ret; reinit_completion(&sys_controller->c); ret = mbox_send_message(sys_controller->chan, msg); - if (ret >= 0) { - if (wait_for_completion_timeout(&sys_controller->c, timeout)) { - ret = 0; - } else { - ret = -ETIMEDOUT; - dev_warn(sys_controller->client.dev, - "MPFS sys controller transaction timeout\n"); - } - } else { - dev_err(sys_controller->client.dev, - "mpfs sys controller transaction returned %d\n", ret); + if (ret < 0) + goto out; + + ret = 0; /* mbox_send_message returns postitive integers on success */ + if (!wait_for_completion_timeout(&sys_controller->c, timeout)) { + ret = -ETIMEDOUT; + dev_warn(sys_controller->client.dev, + "MPFS sys controller transaction timeout\n"); } +out: mutex_unlock(&transaction_lock); return ret;