Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp2752384imw; Wed, 6 Jul 2022 11:07:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t4fEmv3S4GsrIRiuw4SuyI+4FcZnR6Ak3QjD2t9ZLM4MU14yeuUXWmA36WNUhZpHWCqspk X-Received: by 2002:a05:6402:3553:b0:434:ef34:664f with SMTP id f19-20020a056402355300b00434ef34664fmr56628045edd.236.1657130819932; Wed, 06 Jul 2022 11:06:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657130819; cv=none; d=google.com; s=arc-20160816; b=puFOhCGw2vGXb/Wx3DSqqMdSmRex9PEJOYBzndwOH1JjjpvA50Qy1qATdwVihocw9E ye8lc6Xf8H7NLW+pYltmhe1BzOORVk916zxvwdqzAQlrztBQ7BKI3qLYO1RcrqTgrPmj 9gx8OmmHsRRNc1IO+E+d4HZTzPhwM/lVnjeYipWqkw+nj3xqjQzzbvbhA8iPzGM9veD5 ppvsBjC3Qef6Bn2bl/bG21Cf0ztdc/rjfvWLlB3dd2MHMV+YwG1Vvy3VHj8rVa5JhO2m JdRIDCA97NDlQZ0n7f1fUeqIpyImbrhuKQ+TTRQNACMm3xYWeDbe/g0knMI9XGODF+pW YWCA== 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=yav60sk4t1jSHI9y7JwNTzYMHxVBsDg0h4MxYyUTEPE=; b=tlE0gCE/5CH7tMsE7ff9JP4MMkUWG6kMQi/bttqRRVKzMbM9bs8DVrUEFu3p8e+/9V 3sd+DDViw6VLOjkDMtAswjOh+vlnVTXqlvkc87fJo4KRiNzwYlxRxuCBA0R3lrpbGBCl NKTPn9RiFhSozd7C+zarGsbM3HlnURcHIVhkt0BE3Sycfvqp3uMRxh4+lPIWEuFab+IX y4DnBQ66ovcU13NGNeiX8voRCJTKbfYmGv+zhYr1tvBYrYNY7QsrrlSMb5Ydzqyoi0x4 n+XyF0dQ91pCjVNw8i/hU9WjYwzen1Arpeb4IYjCVpLzAeBcOnNUIaELhMsx86fDQGF/ Ov0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=j2Jn45au; 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=chromium.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fd1-20020a056402388100b0043a6c3649e5si10110056edb.183.2022.07.06.11.06.22; Wed, 06 Jul 2022 11:06:59 -0700 (PDT) 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=@chromium.org header.s=google header.b=j2Jn45au; 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=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233680AbiGFRXz (ORCPT + 99 others); Wed, 6 Jul 2022 13:23:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233905AbiGFRXl (ORCPT ); Wed, 6 Jul 2022 13:23:41 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6016D2A72C for ; Wed, 6 Jul 2022 10:23:38 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id y18so6176696plb.2 for ; Wed, 06 Jul 2022 10:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yav60sk4t1jSHI9y7JwNTzYMHxVBsDg0h4MxYyUTEPE=; b=j2Jn45au290gtTFCTf5ikH5yAqAHf0I7w5DZ6J2ln2fTcaKI1HD+BMjDKiRf1fWhsh XfiCuSZJyaHD/8ghRqM5EcDDKHtC+IzPaP0SpwDeXP4r9gVE5NuBWd/QOd2qKPIqblc9 h/DGkYqxjMj00Jr6530xkwT3Gme6bs4dSOdfc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yav60sk4t1jSHI9y7JwNTzYMHxVBsDg0h4MxYyUTEPE=; b=ZU95Nn1BSh+/yEK8vJlOquBOXusKPGOwCLpRe0kT4O9EdaVjWvbYHEDQrmOqr41VxT axIBkh/aSvoTxZYv/384D4QIfNohNRcqz9/64Tg3Nfbltheps2fn1dxNN1IzRwoM/dlk oq2KcN1SaTgOjVXyrDnggzPPalOtg7aD9/mTj2xHAV/TYKZn6qb/+EH48MrBt+lVJgBE BvYeRfuQOI9+gMLbIR6BxX7VC0fUI0AGh6Oz18Z7dS0MLBQfZY8kgOaad0lUKUafNPEA ZXd3rroD5EPIJ6cBxvdXaOy4gFDmJhJYU5gT5iuWn4Yp9w83+kuWUNF0pgxCw8njmWaj P24g== X-Gm-Message-State: AJIora+O0xS48283yV2znUkgLS7ZrxhR7pLBuL9pN23vVzdygjggJINR hbcJ+sajmTH0H4YwvOtfxtTiKSfBZvviyA== X-Received: by 2002:a17:902:d50b:b0:16c:474:ce67 with SMTP id b11-20020a170902d50b00b0016c0474ce67mr3487691plg.112.1657128217975; Wed, 06 Jul 2022 10:23:37 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:23:37 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Kees Cook , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 8/9] platform/chrome: cros_ec_typec: Cleanup switch handle return paths Date: Wed, 6 Jul 2022 17:15:12 +0000 Message-Id: <20220706171601.807042-9-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 Some of the return paths for the cros_typec_get_switch_handles() aren't necessary. Clean up the return paths to only undo the handle get's which succeeded. Signed-off-by: Prashant Malani --- Changes since v1: - No changes. drivers/platform/chrome/cros_ec_typec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c index 7cb2e35c4ded..39e6fd4491a9 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -157,12 +157,10 @@ static int cros_typec_get_switch_handles(struct cros_typec_port *port, return 0; role_sw_err: - usb_role_switch_put(port->role_sw); -ori_sw_err: typec_switch_put(port->ori_sw); -mux_err: +ori_sw_err: typec_mux_put(port->mux); - +mux_err: return -ENODEV; } -- 2.37.0.rc0.161.g10f37bed90-goog