Based on: *2dc8224e37/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c* https://lore.kernel.org/all/20241016-b4-rk3588-bridge-upstream-v10-1-87ef92a6d14e@collabora.com/ *a52dffaa46/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c*a52dffaa46/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c*a52dffaa46/drivers/gpu/drm/rockchip/rockchip_vop2_reg.cSigned-off-by: Liangbin Lian <jjm2473@gmail.com>
67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
From 7562f48e8f344af19a71d0a6c626bc16f22e6ad3 Mon Sep 17 00:00:00 2001
|
|
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
|
|
Date: Tue, 18 Mar 2025 14:35:41 +0200
|
|
Subject: [PATCH 06/11] phy: rockchip: samsung-hdptx: Drop superfluous cfgs
|
|
driver data
|
|
|
|
The ->cfgs member has been introduced via commit f08d1c085638 ("phy:
|
|
phy-rockchip-samsung-hdptx: Don't use dt aliases to determine phy-id"),
|
|
but it is only used during probe() in order to setup ->phy_id.
|
|
|
|
Use a probe() local variable to store device match data and remove the
|
|
now unnecessary member from struct rk_hdptx_phy.
|
|
|
|
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
|
|
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
|
|
Link: https://lore.kernel.org/r/20250318-phy-sam-hdptx-bpc-v6-7-8cb1678e7663@collabora.com
|
|
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
---
|
|
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 12 +++++-------
|
|
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
|
|
index 4e082ab31cae..de333b743810 100644
|
|
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
|
|
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
|
|
@@ -245,10 +245,7 @@ struct rk_hdptx_phy {
|
|
struct regmap *regmap;
|
|
struct regmap *grf;
|
|
|
|
- /* PHY const config */
|
|
- const struct rk_hdptx_phy_cfg *cfgs;
|
|
int phy_id;
|
|
-
|
|
struct phy *phy;
|
|
struct clk_bulk_data *clks;
|
|
int nr_clks;
|
|
@@ -1036,6 +1033,7 @@ static int rk_hdptx_phy_runtime_resume(struct device *dev)
|
|
|
|
static int rk_hdptx_phy_probe(struct platform_device *pdev)
|
|
{
|
|
+ const struct rk_hdptx_phy_cfg *cfgs;
|
|
struct phy_provider *phy_provider;
|
|
struct device *dev = &pdev->dev;
|
|
struct rk_hdptx_phy *hdptx;
|
|
@@ -1054,14 +1052,14 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev)
|
|
return dev_err_probe(dev, PTR_ERR(regs),
|
|
"Failed to ioremap resource\n");
|
|
|
|
- hdptx->cfgs = device_get_match_data(dev);
|
|
- if (!hdptx->cfgs)
|
|
+ cfgs = device_get_match_data(dev);
|
|
+ if (!cfgs)
|
|
return dev_err_probe(dev, -EINVAL, "missing match data\n");
|
|
|
|
/* find the phy-id from the io address */
|
|
hdptx->phy_id = -ENODEV;
|
|
- for (id = 0; id < hdptx->cfgs->num_phys; id++) {
|
|
- if (res->start == hdptx->cfgs->phy_ids[id]) {
|
|
+ for (id = 0; id < cfgs->num_phys; id++) {
|
|
+ if (res->start == cfgs->phy_ids[id]) {
|
|
hdptx->phy_id = id;
|
|
break;
|
|
}
|
|
--
|
|
2.51.0
|
|
|