drm/msm/dp: drop struct msm_dp_panel_in

All other submodules pass arguments directly. Drop struct
msm_dp_panel_in that is used to wrap dp_panel's submodule args and pass
all data to msm_dp_panel_get() directly.

Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Tested-by: Stephen Boyd <swboyd@chromium.org> # sc7180-trogdor
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/629055/
Link: https://lore.kernel.org/r/20241216-fd-dp-audio-fixup-v4-4-f8d1961cf22f@linaro.org

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index aba925aab7ad7c6652e81004043864c1cb3ac370..fe51a01a69db01e740fb248e012b8f04b2def024 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -722,9 +722,6 @@ static int msm_dp_init_sub_modules(struct msm_dp_display_private *dp)
 {
        int rc = 0;
        struct device *dev = &dp->msm_dp_display.pdev->dev;
-       struct msm_dp_panel_in panel_in = {
-               .dev = dev,
-       };
        struct phy *phy;
 
        phy = devm_phy_get(dev, "dp");
@@ -765,11 +762,7 @@ static int msm_dp_init_sub_modules(struct msm_dp_display_private *dp)
                goto error_link;
        }
 
-       panel_in.aux = dp->aux;
-       panel_in.catalog = dp->catalog;
-       panel_in.link = dp->link;
-
-       dp->panel = msm_dp_panel_get(&panel_in);
+       dp->panel = msm_dp_panel_get(dev, dp->aux, dp->link, dp->catalog);
        if (IS_ERR(dp->panel)) {
                rc = PTR_ERR(dp->panel);
                DRM_ERROR("failed to initialize panel, rc = %d\n", rc);

diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
index 7d122496723a32fd591d094269397a9fdd51fe44..92415bf8aa16655a6cf4f7d6f8a5896275edf001 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_panel.c
+++ b/drivers/gpu/drm/msm/dp/dp_panel.c
@@ -475,25 +475,26 @@ static int msm_dp_panel_parse_dt(struct msm_dp_panel *msm_dp_panel)
        return 0;
 }
 
-struct msm_dp_panel *msm_dp_panel_get(struct msm_dp_panel_in *in)
+struct msm_dp_panel *msm_dp_panel_get(struct device *dev, struct drm_dp_aux *aux,
+                             struct msm_dp_link *link, struct msm_dp_catalog *catalog)
 {
        struct msm_dp_panel_private *panel;
        struct msm_dp_panel *msm_dp_panel;
        int ret;
 
-       if (!in->dev || !in->catalog || !in->aux || !in->link) {
+       if (!dev || !catalog || !aux || !link) {
                DRM_ERROR("invalid input\n");
                return ERR_PTR(-EINVAL);
        }
 
-       panel = devm_kzalloc(in->dev, sizeof(*panel), GFP_KERNEL);
+       panel = devm_kzalloc(dev, sizeof(*panel), GFP_KERNEL);
        if (!panel)
                return ERR_PTR(-ENOMEM);
 
-       panel->dev = in->dev;
-       panel->aux = in->aux;
-       panel->catalog = in->catalog;
-       panel->link = in->link;
+       panel->dev = dev;
+       panel->aux = aux;
+       panel->catalog = catalog;
+       panel->link = link;
 
        msm_dp_panel = &panel->msm_dp_panel;
        msm_dp_panel->max_bw_code = DP_LINK_BW_8_1;

diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
index 47c1d349be470b60596b64a7bc8c7c39d2e8fdd1..4906f4f09f2451cfed3c1007f38b4db7dfdb1d90 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_panel.h
+++ b/drivers/gpu/drm/msm/dp/dp_panel.h
@@ -21,13 +21,6 @@ struct msm_dp_display_mode {
        bool out_fmt_is_yuv_420;
 };
 
-struct msm_dp_panel_in {
-       struct device *dev;
-       struct drm_dp_aux *aux;
-       struct msm_dp_link *link;
-       struct msm_dp_catalog *catalog;
-};
-
 struct msm_dp_panel_psr {
        u8 version;
        u8 capabilities;
@@ -91,6 +84,7 @@ static inline bool is_lane_count_valid(u32 lane_count)
                lane_count == 4);
 }
 
-struct msm_dp_panel *msm_dp_panel_get(struct msm_dp_panel_in *in);
+struct msm_dp_panel *msm_dp_panel_get(struct device *dev, struct drm_dp_aux *aux,
+                             struct msm_dp_link *link, struct msm_dp_catalog *catalog);
 void msm_dp_panel_put(struct msm_dp_panel *msm_dp_panel);
 #endif /* _DP_PANEL_H_ */