From patchwork Wed Oct 19 11:35:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 5325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp285773wrs; Wed, 19 Oct 2022 05:08:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6OLaxvoGJ3MflMbNda2hG0g3rLwXaTTG5W7XssLBXGDhdV699MNaOnt5jjZ8/EMiHQyLMn X-Received: by 2002:a17:907:a06d:b0:78d:ceae:ba5a with SMTP id ia13-20020a170907a06d00b0078dceaeba5amr6551304ejc.586.1666181307325; Wed, 19 Oct 2022 05:08:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666181307; cv=none; d=google.com; s=arc-20160816; b=sZo/OBGikZwtE7kYhsGFLXoYpI2lgcZkSpAHjhttFyDJ4DGpMi/AOmKajkQDOYD0EG PzbFH9JJHz36a49ibHHeqz9HzeMxVLOGy6A2ZNo2QeXFeSHjQuWTEqiXZm371m1+bqLB GbaWjihkV9LL/KCSaQouLcXgSWUDVs8lVeVgEKSHdFjubl7VTA61F9UHa0YIEM5YYD4+ 9Qx9Y0sQtNqHgwm6HRWTTdwzUuc2QjA1x6EXrZ+f4AHg2Pd4ZzIjFUUQUPkI8kjkFsRZ 3fGEAsInOraA4ZVosWEBohiPlRtol7emUGPjP0EARcC+S8eLpHYyOokb+eYuWXOtHetm h+BQ== 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=XtSC0DOUnTbuIKklr/2utltRFn958x+R2y7JWeiMFh0=; b=zwh94c3H651ZknZraiUdPAlMCEDmzDM5Vd/fVcXpwZlgM19Pi3wZVGVT8xHCy/vYE8 z8G4yz1tSkoz8fapcnj1BMzljAyIYZSJKzgXj9LGyLwNDGa9iJN4vHTz1mbYjk6Wrvwr DiIQ+oNmluLggRh38+tzlkZTn4xGEAmo5MLDkYFnhwJmMZgrQi+VclbxtQDnKX1EMjSQ Ihv2Y6fTCy0Nr1FydTaG2666HjbA7u5KQ4eui0oaKpARyPEvGxSbAckrdpgiqiDh4cKj 52/ZCAqbRpIBJQBrGOzn5wbsO3LbO+gqpMnudotbRlPDoSdWn67sOO6qyW4QZ89IccHv dakw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ifsSDtPC; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e9-20020a056402190900b0045d9ceae633si8798289edz.55.2022.10.19.05.08.02; Wed, 19 Oct 2022 05:08:27 -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=@kernel.org header.s=k20201202 header.b=ifsSDtPC; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232592AbiJSMGn (ORCPT + 99 others); Wed, 19 Oct 2022 08:06:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230006AbiJSMGN (ORCPT ); Wed, 19 Oct 2022 08:06:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10009641E; Wed, 19 Oct 2022 04:43:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4ED96B822B1; Wed, 19 Oct 2022 11:36:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14B15C43470; Wed, 19 Oct 2022 11:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666179379; bh=3R9BPW6QSUhhXBNcO5z3mLwkQgvqyw63TThHmZ5QLXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ifsSDtPC942/gZjyZq05/kninkH6yxBIDiVxut5/UzMpYZSwgSynt5k3jIzONRXpr BonC/IeWapTGN63Ybns7s08988udQq6bZ6ByioVbLb9hxHNDHUdzCrLvXNLW8yoU26 mgzuFfBUsCUWdaHqIolUWla4Jk8lYego3Ijef95cntMnhVCjN5v7TLlIIKY8js0hl9 CJSFFEAWr6yBKr8ZujRAJaueaW/pY6Hwv8C0fqjq4s2yxuybiTmveqLiNKNbVV5jUY fOVA4i5mzht4Y/YPJ+OPAlqV/2KtBMwv4NYcKIlz8I4lL/4VRWQtfWsZHAPKVFlqqg iGInOLRuSgIRw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1ol7Ml-0005pN-Io; Wed, 19 Oct 2022 13:36:07 +0200 From: Johan Hovold To: Vinod Koul Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Dmitry Baryshkov , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 04/15] phy: qcom-qmp-pcie: clean up device-tree parsing Date: Wed, 19 Oct 2022 13:35:41 +0200 Message-Id: <20221019113552.22353-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221019113552.22353-1-johan+linaro@kernel.org> References: <20221019113552.22353-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,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?1747117730145066033?= X-GMAIL-MSGID: =?utf-8?q?1747117730145066033?= Since the QMP driver split there will be at most a single child node so drop the obsolete iteration construct. While at it, drop the verbose error logging that would have been printed also on probe deferrals. Note that there's no need to check if there are additional child nodes (the kernel is not a devicetree validator), but let's return an error if there are no child nodes at all for now. Signed-off-by: Johan Hovold --- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 34 +++++++----------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c index 667a87e7c917..bc96518ad6b0 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c @@ -2250,7 +2250,6 @@ static int qmp_pcie_probe(struct platform_device *pdev) void __iomem *serdes; const struct qmp_phy_cfg *cfg = NULL; struct qmp_pcie *qmp; - int num, id; int ret; qmp = devm_kzalloc(dev, sizeof(*qmp), GFP_KERNEL); @@ -2283,34 +2282,19 @@ static int qmp_pcie_probe(struct platform_device *pdev) if (ret) return ret; - num = of_get_available_child_count(dev->of_node); - /* do we have a rogue child node ? */ - if (num > 1) + child = of_get_next_available_child(dev->of_node, NULL); + if (!child) return -EINVAL; - id = 0; - for_each_available_child_of_node(dev->of_node, child) { - /* Create per-lane phy */ - ret = qmp_pcie_create(dev, child, serdes, cfg); - if (ret) { - dev_err(dev, "failed to create lane%d phy, %d\n", - id, ret); - goto err_node_put; - } + ret = qmp_pcie_create(dev, child, serdes, cfg); + if (ret) + goto err_node_put; - /* - * Register the pipe clock provided by phy. - * See function description to see details of this pipe clock. - */ - ret = phy_pipe_clk_register(qmp, child); - if (ret) { - dev_err(qmp->dev, - "failed to register pipe clock source\n"); - goto err_node_put; - } + ret = phy_pipe_clk_register(qmp, child); + if (ret) + goto err_node_put; - id++; - } + of_node_put(child); phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);