From patchwork Thu Sep 19 22:03:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 174104 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1598610ill; Thu, 19 Sep 2019 15:12:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5PEIw4QIc1ajw6V72Uolj4lW4+P6AKZI63WPMM0037NsJL5vBT1gkzKbjQCsbSd+wA/49 X-Received: by 2002:aa7:d789:: with SMTP id s9mr18714633edq.62.1568931174543; Thu, 19 Sep 2019 15:12:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568931174; cv=none; d=google.com; s=arc-20160816; b=Isr/CttIHi4bFgldoEb9G+nVVhnqKHl0rqAS2Y+Pn1zZANIUvJwVAOCMUgeCw8EOGO hYCTIqi3jR/Ilb5Hd6vCWctrEO6xFDNFoIMb4cgesTXp+qvw3ESoClBQqM4Gv8u3RiV6 tudU5BmKjTy+6vcGnBxcJeBaZcYHKcHhjAKhU+paAZF3+sKdwXahbTWYgZyG5eJih9HI d/XCE3SOsKiXqeJRj/uNwCxHsGnnGO462E3cyzaL8S1bmGi2QVxi2ZVClw1v83bp40IC ISA9Ct5XkjpVOhoPW3v/eaO0yPO5uJdhPW9VT8tgGlP11o2DNawGio/HJYHidvI2kUe9 MsJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qtv4NupbhgfCmxXwZ93+ob4hlBU4LGilLE4FK+cPii0=; b=B91lNyEW9sXihXoRBO62KYCev2BygJ2IW52lvysn/3tvcXePmbHJUq369emNTw28Ce +T+sVfilrzuVuAcM2RUXFNvs6cljcf4HJJp0Kx4SUhwqv8kAtQNwNYBGebo0ug489qXB 3SiH8awSF85WigR/hyVyixstOE35PWL+DCl8yR6Sc+QosY33JlRtV1UctTfov5d4UuxQ BacGvg/NlMk8tQvEfemq7svG8Z2pYLfL5Z3OAo5iG5SElcpTgP4NwchKbH1f9ZdDfYaV o65ml7ImwLxWLaWprHSqBcN0t5wkcegZIZmPTHnxkUbH1zak331HgSDOKYtGxQktazrz /2Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ue5IpRDi; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d48si59539eda.383.2019.09.19.15.12.54; Thu, 19 Sep 2019 15:12:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ue5IpRDi; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404162AbfISWMw (ORCPT + 14 others); Thu, 19 Sep 2019 18:12:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:51894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393681AbfISWMv (ORCPT ); Thu, 19 Sep 2019 18:12:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 75BB921928; Thu, 19 Sep 2019 22:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931170; bh=y+twx5L5mLyZA/HpEM5GdqYd/BMLorMN/INrMAODq3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ue5IpRDi6+eu2tS11NUGPIDBvRmMomHTmLbPeXCesxjePG6l/A7mhyiIfs3a9Int5 +WjOJ5vWzpJ1q6cPLH8Z+HBLAIvtIK0x0U29nYsW8aHJD4rYVlFlYPPQVjSUuNg0KQ sn+xg4sYM8OCBK3PXSspzx3JOYkdwjX7SQpM2LQA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Suman Anna , Tony Lindgren , Sasha Levin Subject: [PATCH 4.19 28/79] bus: ti-sysc: Simplify cleanup upon failures in sysc_probe() Date: Fri, 20 Sep 2019 00:03:13 +0200 Message-Id: <20190919214810.352045042@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214807.612593061@linuxfoundation.org> References: <20190919214807.612593061@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suman Anna [ Upstream commit a304f483b6b00d42bde41c45ca52c670945348e2 ] The clocks are not yet parsed and prepared until after a successful sysc_get_clocks(), so there is no need to unprepare the clocks upon any failure of any of the prior functions in sysc_probe(). The current code path would have been a no-op because of the clock validity checks within sysc_unprepare(), but let's just simplify the cleanup path by returning the error directly. While at this, also fix the cleanup path for a sysc_init_resets() failure which is executed after the clocks are prepared. Signed-off-by: Suman Anna Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- drivers/bus/ti-sysc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 4ca006e2137f7..e95b26319cd91 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1685,7 +1685,7 @@ static int sysc_probe(struct platform_device *pdev) error = sysc_init_dts_quirks(ddata); if (error) - goto unprepare; + return error; error = sysc_get_clocks(ddata); if (error) @@ -1693,27 +1693,27 @@ static int sysc_probe(struct platform_device *pdev) error = sysc_map_and_check_registers(ddata); if (error) - goto unprepare; + return error; error = sysc_init_sysc_mask(ddata); if (error) - goto unprepare; + return error; error = sysc_init_idlemodes(ddata); if (error) - goto unprepare; + return error; error = sysc_init_syss_mask(ddata); if (error) - goto unprepare; + return error; error = sysc_init_pdata(ddata); if (error) - goto unprepare; + return error; error = sysc_init_resets(ddata); if (error) - return error; + goto unprepare; pm_runtime_enable(ddata->dev); error = sysc_init_module(ddata);