From patchwork Mon Apr 3 20:23:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 78722 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2564752vqo; Mon, 3 Apr 2023 13:26:10 -0700 (PDT) X-Google-Smtp-Source: AKy350Z/TM0+POZcFJdLTmwJ9868cHPcWud1sriLUi9beNMaUx4qwrTozGWndh78rECDS+kLX0Un X-Received: by 2002:aa7:9986:0:b0:62e:407:fc69 with SMTP id k6-20020aa79986000000b0062e0407fc69mr6835241pfh.21.1680553570375; 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=B2e9yyUYE2Cg/iHRDm3fc/0uK3jQSX+JsQ8YqiWYj8L5E5pmuZNqqLaPQwfftFL7T/ Phzj3xS85VvpYv5RqCj6HzXrm7OPCdVUBeWcOakBKtEwy/yJesfk+PI767Hh9lLXGqIn PgKw6asjws4f9p0KMRPzfwJDqcgEPohqWDJIZRc5JVKiJI9RwbdXwIb3Xx6KmP5Wv6b2 dGBLyDpeKM5fqDSSIfBBABE8VxUWyizsFCy/ewWlGtF7Bn1FaeXVo/wNAe4SzwDwJdsc lPZ3UDm3Lxb2TVxFuHVOjvyFfJTWIsDrsLgE+p3TABWV0qJmrGpm0nhTY7kBFC9jHZhf +akQ== 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=e6xYpSoWm4Ct5fvk0k/luVhefgUEWb9OlkoSNE8EtP4=; b=awfLpQLwukmZTD5WE5BFrfchxeUNZuWu//+1oyEE8ujAO5/BQCToAXqSQsShTyJxm5 CQXvuVZlLDML6LhlSB6O5LWSY3SYwO2exKumFAPJtYvgVIEaAlp3s1O+ZPdlt/AUaCR3 qfRbzqg1uK3P0cyvt5sfhcm7YiGVWHyn3bo18bdFLp28CO7rS/fxxHaaEGXnFNpPdz9/ UhEXyDRKM40HqXHbN9vXqK8LCTsLrLCNafhlOXq8yi2vsGONR+TKK0K9eTvkU431qg6T lqB/xni3ahit4QOs4muMToWqwZCvBvm4vqgoy5E9/NNNbzFG3JPqBR03iGpGSjfFY6TR fKZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=S3FDcWaN; 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 i12-20020a056a00004c00b0062a4722bb2asi8771805pfk.278.2023.04.03.13.25.57; 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=S3FDcWaN; 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 S232653AbjDCUXi (ORCPT + 99 others); Mon, 3 Apr 2023 16:23:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232778AbjDCUXR (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 5AC001FD2; 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 DDF04660316C; 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=IaXnd/TmDz+Pb/Lo3qVMIEFOaBSU3EHyiLnXscaJdlo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S3FDcWaNuohQVCrTCsFItK51ce4vVpzyorjjVHaXNJ3P/3sMyu85H+8zVM0NyntzK Qsd1xW2QcRLax4LNEUDacbACP8nX93jDHkxbswcoqpPR9lk9LR03LoxGZuriTm1i6Y q+5tEnFHDT0lFGRaS7wfMdQkDVeWeNa+cKDkivijl1IJW7GQHz3+d/HAxLiIWqzVQK gIQWRQRVUEKaxMMb076UtM09YCv8dPG0cKeXfVPzcGboPrwxrS3YbotxBTKjd47rFu grmtOJCYgByHQOu6udWI7RIsO9/tr/QiaqLqw+LbYXeisOtFGvlQegFwtGyQ3KYcZy etPpQUaor+uNw== Received: by jupiter.universe (Postfix, from userid 1000) id 16D574807F3; 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 7/7] phy: phy-rockchip-inno-usb2: simplify getting match data Date: Mon, 3 Apr 2023 22:23:07 +0200 Message-Id: <20230403202307.120562-8-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?1762188140791558206?= X-GMAIL-MSGID: =?utf-8?q?1762188140791558206?= Simplify the code by directly getting the match data via device_get_match_data() instead of open coding its functionality. Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index 2de1408eaa60..e978c73ba1e5 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -1305,7 +1305,6 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev) struct phy_provider *provider; struct rockchip_usb2phy *rphy; const struct rockchip_usb2phy_cfg *phy_cfgs; - const struct of_device_id *match; unsigned int reg; int index, ret; @@ -1313,12 +1312,6 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev) if (!rphy) return -ENOMEM; - match = of_match_device(dev->driver->of_match_table, dev); - if (!match || !match->data) { - dev_err(dev, "phy configs are not assigned!\n"); - return -EINVAL; - } - if (!dev->parent || !dev->parent->of_node) { rphy->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,usbgrf"); if (IS_ERR(rphy->grf)) { @@ -1359,12 +1352,15 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev) } rphy->dev = dev; - phy_cfgs = match->data; + phy_cfgs = device_get_match_data(dev); rphy->chg_state = USB_CHG_STATE_UNDEFINED; rphy->chg_type = POWER_SUPPLY_TYPE_UNKNOWN; rphy->irq = platform_get_irq_optional(pdev, 0); platform_set_drvdata(pdev, rphy); + if (!phy_cfgs) + return dev_err_probe(dev, -EINVAL, "phy configs are not assigned!\n"); + ret = rockchip_usb2phy_extcon_register(rphy); if (ret) return ret;