From patchwork Sun Aug 20 23:58:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 715211 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 806DBEE49A4 for ; Sun, 20 Aug 2023 23:58:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231708AbjHTX6T (ORCPT ); Sun, 20 Aug 2023 19:58:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232153AbjHTX6S (ORCPT ); Sun, 20 Aug 2023 19:58:18 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E0FEAA for ; Sun, 20 Aug 2023 16:58:16 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-50079d148aeso1134495e87.3 for ; Sun, 20 Aug 2023 16:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692575894; x=1693180694; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=lY5n8pvkZ+2T1rqIQ+TPmE/hW2jf5Gx3K91sbxE80mc=; b=jjwSYY0dMPHSPnYcJMc/+qkpHjd8baHB8UdX63W+hH3G2lcC2S5lAwWMbqPcOEIIpR 2HSgDSXFh5tl7cGitQjwUWFhnqfk7nwhOtmnolu9+nwq25ybtjzEFvLJmkvzMwAUVR+J 7aEjvZmfbW8AYZvFV04jd9Q7LS2J5bYzLjUqiLoXlJ+r1Arns86VVRfNxLJrV2S7WPw5 FUXNgmtazKvyNZVJzuWe5WsiXd2ZKGBPBo/ZfGEFHDk+nlCMfRP2KqFFRmCDeEISkq8i 5zqcEQSGoP1XwL/kzg1W1/Ea79gDqCKBt35pd6Ck9kRD4iaCvB+fB0oYpPJTHNV0wlC1 tcJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692575894; x=1693180694; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lY5n8pvkZ+2T1rqIQ+TPmE/hW2jf5Gx3K91sbxE80mc=; b=VjS1xGWfq5OEtr910gXU+eubTkQgmgbJs9l/zjsfcDF+GTYrnlYh6zg5Q20PjjVOtU ntGedJCbvu2uCuVu9JG/jquMevUwJCsXMTrwNrpI7GdBoPtOCGtHy+49q8m6Ea5zLnua J7EXL9scXFe+qt7JEKgfARLGI/7kDffD2N4Mt37TckBvwOcfPTYkr732/f0uuUYI1DgL FhPAN774yaZcYXo9yctddj9BxLw7QMDZlhBsiixjdh50rH7Xbd9bX2BLiNF3t2v4ZooC 3UFXPV1QIbtYaJ3sfmqS/JReQb0rHkY1K8c4cHYAJB83Zr+F97Osegg/3D/ARF2LBM0g RD6g== X-Gm-Message-State: AOJu0YyRVfzPLybzPHbWURAIiLMNtntLQ60kxiGTmy8DXl3Ym0gNvIWL u54G7fTNOpeOnhenUe0oDe8DmRuKYfFNFl0M4ng= X-Google-Smtp-Source: AGHT+IFfkquvhaHxM3dAUzYxcyY2IICA+/G1U9dK+yXHGz4Q4pHDjl9E0SLnTnXpnELmzni8Xp+05A== X-Received: by 2002:a05:6512:1047:b0:4ff:8aad:8c7b with SMTP id c7-20020a056512104700b004ff8aad8c7bmr4344495lfb.68.1692575894450; Sun, 20 Aug 2023 16:58:14 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id h9-20020ac24da9000000b004ff9ed89408sm1442599lfe.193.2023.08.20.16.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Aug 2023 16:58:13 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org Subject: [PATCH] phy: qcom-qmp-combo: fix clock probing Date: Mon, 21 Aug 2023 02:58:13 +0300 Message-Id: <20230820235813.562284-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org During rebase of qcom-qmp-combo series a call to devm_clk_bulk_get_all() got moved by git from qmp_combo_parse_dt_legacy() to phy_dp_clks_register(). This doesn't have any serious effect, since the clocks will be set in both legacy and non-legacy paths. However let's move it back to place anyway, to prevent the driver from fetching clocks twice. Fixes: 28e265bf84a8 ("phy: qcom-qmp-combo: simplify clock handling") Signed-off-by: Dmitry Baryshkov --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 9c3de41ecedb..cbb28afce135 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -3067,12 +3067,6 @@ static int phy_dp_clks_register(struct qmp_combo *qmp, struct device_node *np) if (ret) return ret; - ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks); - if (ret < 0) - return ret; - - qmp->num_clks = ret; - return 0; } @@ -3332,6 +3326,12 @@ static int qmp_combo_parse_dt_legacy(struct qmp_combo *qmp, struct device_node * if (ret) return ret; + ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks); + if (ret < 0) + return ret; + + qmp->num_clks = ret; + return 0; }