From patchwork Mon Apr 3 20:23:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 78720 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2564751vqo; Mon, 3 Apr 2023 13:26:10 -0700 (PDT) X-Google-Smtp-Source: AKy350ZUqV2LESepS7lxD7kBaDCPeZwalYXPWrAs7FkIzEjskTrrTc7AiCv8ZKtq7tbXGkD79926 X-Received: by 2002:aa7:8f14:0:b0:626:29ed:941f with SMTP id x20-20020aa78f14000000b0062629ed941fmr35051908pfr.5.1680553570236; Mon, 03 Apr 2023 13:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680553570; cv=none; d=google.com; s=arc-20160816; b=SNqbk10aGA8HJukerk/kQukRelzIs6+jv8KgjMCePwkxJan6tnJp0KkGR+Fj6u0Jja /E2SqAn4RXK5WYgWnqileSZ8N7jxNhM+VBchYiaYNVrmklCVdc9Q8Jov+Vu2skTWGWNR 4RD5LJRNs3KXGcMzKe8CGkdD4Z94wtgPILURke7wbd/pjlXOOzevUQmk4n684VplqgsX gKYZMgHvKgVPhkoFaKakTNZAXmCiBQBRIVBJ/MmaJdjg4BoWVbZfe3mxbbhkPsqeB56B WntofeRYm9/cO35tEoUTVtczTyrjry061aKdZAsfr0yPurRCpQz4vR6Pjpn6bz3ll1f/ vqYA== 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=QQTmSBHgJDD6g15kY8a+c9mVob79gLFshoF9bx1EU1A=; b=f8ulnKX+UHRZS13xkpH9/zwrMhC7QAsVzwqVJMnJG1A6uBzI458tvgfnY8YOMQRJG6 PtrU8WBysyaW2xE/++XFz/835FEW5dt52vwc4a8GmAEpfO2FHO9lJRa6CN9g5WnA1IAz IO4n5XrIuOy5UXz4BHsOrK4Qg6/Yp5hZjXXDBrLIVufRTt94YPxIDj11rZteevfObaat zTp/5ysckJUC/kY3/60j6XeZpczg5Xo4I8Qw6Cct1OlmAF6go054InPq27wYWLtdgrxz VodlPp9brMrAQz3IClrh1fGtm55grWJFa0aX7PsvXEyET3earbEpMu7aSK/7Ar3HOXcT jcSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=kqT8QSd5; 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=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f127-20020a625185000000b0059248a91d9bsi8873242pfb.127.2023.04.03.13.25.55; Mon, 03 Apr 2023 13:26:10 -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=@collabora.com header.s=mail header.b=kqT8QSd5; 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=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233239AbjDCUXc (ORCPT + 99 others); Mon, 3 Apr 2023 16:23:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229509AbjDCUXR (ORCPT ); Mon, 3 Apr 2023 16:23:17 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 196EE1FEE; Mon, 3 Apr 2023 13:23:16 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-212-192.ewe-ip-backbone.de [91.248.212.192]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id D3A316603162; Mon, 3 Apr 2023 21:23:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680553395; bh=0AvnUkLP+KMEub7LlbfJLBC/RaxG7cnldhb+34NFfeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kqT8QSd5xC5Zn0kxCvSR4k+bV5Mwq/AX6a3Esoh79VDC6EvNEl7QC07blK6+R5/AI Pj5sj5tTks1PhbhhLT3NqBjB6oNf8B5BST4g5XZl+4zzGn8RE0xzn7+ya3OBH0E+QH 0ovrdHQ6Ok1XLtALq3T7Fwn+QMgJP5U1gQ8ChzTbkqvYrN03mXtEFSOdK8dIuNL+Az QHh04QCYqdPLmVp5zxq3ZcCTr0CIMONCxUxSjoQunoW0ayIa+2beS0ebtOWflpnpWw 8hIkgPL3iKYUrfU/h+oh4GxYvKFv7wqFTKrFd8E05cbWPKglpXXlFpFfVQcTd+1NOF iIBaCwSIY0YGA== Received: by jupiter.universe (Postfix, from userid 1000) id 14F3F4807F2; Mon, 3 Apr 2023 22:23:09 +0200 (CEST) From: Sebastian Reichel To: Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Heiko Stuebner , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sebastian Reichel , kernel@collabora.com Subject: [PATCHv2 6/7] phy: phy-rockchip-inno-usb2: simplify phy clock handling Date: Mon, 3 Apr 2023 22:23:06 +0200 Message-Id: <20230403202307.120562-7-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403202307.120562-1-sebastian.reichel@collabora.com> References: <20230403202307.120562-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762188140262369558?= X-GMAIL-MSGID: =?utf-8?q?1762188140262369558?= Simplify phyclk handling by using devm_clk_get_optional_enabled to acquire and enable the optional clock. This also fixes a resource leak in driver remove path and adds proper error handling. Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index 9f6d09da7fbd..2de1408eaa60 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -1390,24 +1390,22 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev) if (IS_ERR(rphy->phy_reset)) return PTR_ERR(rphy->phy_reset); - rphy->clk = of_clk_get_by_name(np, "phyclk"); - if (!IS_ERR(rphy->clk)) { - clk_prepare_enable(rphy->clk); - } else { - dev_info(&pdev->dev, "no phyclk specified\n"); - rphy->clk = NULL; + rphy->clk = devm_clk_get_optional_enabled(dev, "phyclk"); + if (IS_ERR(rphy->clk)) { + return dev_err_probe(&pdev->dev, PTR_ERR(rphy->clk), + "failed to get phyclk\n"); } ret = rockchip_usb2phy_clk480m_register(rphy); if (ret) { dev_err(dev, "failed to register 480m output clock\n"); - goto disable_clks; + return ret; } if (rphy->phy_cfg->phy_tuning) { ret = rphy->phy_cfg->phy_tuning(rphy); if (ret) - goto disable_clks; + return ret; } index = 0; @@ -1470,11 +1468,6 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev) put_child: of_node_put(child_np); -disable_clks: - if (rphy->clk) { - clk_disable_unprepare(rphy->clk); - clk_put(rphy->clk); - } return ret; }