drm/bridge: analogix_dp: remove unused platform power_on_end callback

This isn't used, but gives the impression of the power on and power off
platform calls being non-symmetrical. Remove the unused callback and
rename the power_on_start to simply power_on.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Robert Foss <rfoss@kernel.org>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Robert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240619182200.3752465-1-l.stach@pengutronix.de

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index b5dbff21c18734ba9c3d8326fd039e5c4b48e9f6..31fa67d966c7975750c71893c2a96da84222f195 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1257,8 +1257,8 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
                goto out_dp_clk_pre;
        }
 
-       if (dp->plat_data->power_on_start)
-               dp->plat_data->power_on_start(dp->plat_data);
+       if (dp->plat_data->power_on)
+               dp->plat_data->power_on(dp->plat_data);
 
        phy_power_on(dp->phy);
 
@@ -1283,9 +1283,6 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
                goto out_dp_init;
        }
 
-       if (dp->plat_data->power_on_end)
-               dp->plat_data->power_on_end(dp->plat_data);
-
        enable_irq(dp->irq);
        return 0;
 

diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c
index f48c4343f4690f6dc288d1d8a1185a604d3c9152..30c8750187ada3c8c701e619a43e618cf77bd3e6 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_dp.c
+++ b/drivers/gpu/drm/exynos/exynos_dp.c
@@ -233,7 +233,7 @@ static int exynos_dp_probe(struct platform_device *pdev)
        /* The remote port can be either a panel or a bridge */
        dp->plat_data.panel = panel;
        dp->plat_data.dev_type = EXYNOS_DP;
-       dp->plat_data.power_on_start = exynos_dp_poweron;
+       dp->plat_data.power_on = exynos_dp_poweron;
        dp->plat_data.power_off = exynos_dp_poweroff;
        dp->plat_data.attach = exynos_dp_bridge_attach;
        dp->plat_data.get_modes = exynos_dp_get_modes;

diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 7069a3d4d58119254a8060c26c37e7eaf2fc82b2..baeb41875a4b85215734f8d9ee4f504fdc958066 100644 (file)
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -92,7 +92,7 @@ static int rockchip_dp_pre_init(struct rockchip_dp_device *dp)
        return 0;
 }
 
-static int rockchip_dp_poweron_start(struct analogix_dp_plat_data *plat_data)
+static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data)
 {
        struct rockchip_dp_device *dp = pdata_encoder_to_dp(plat_data);
        int ret;
@@ -397,7 +397,7 @@ static int rockchip_dp_probe(struct platform_device *pdev)
        dp->data = dp_data;
        dp->plat_data.panel = panel;
        dp->plat_data.dev_type = dp->data->chip_type;
-       dp->plat_data.power_on_start = rockchip_dp_poweron_start;
+       dp->plat_data.power_on = rockchip_dp_poweron;
        dp->plat_data.power_off = rockchip_dp_powerdown;
        dp->plat_data.get_modes = rockchip_dp_get_modes;
 

diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h
index b0dcc07334a1ee5642b7187307ae2553aed7ef41..8709b6a74c0f871c9599c8370b8085bde4587b42 100644 (file)
--- a/include/drm/bridge/analogix_dp.h
+++ b/include/drm/bridge/analogix_dp.h
@@ -29,8 +29,7 @@ struct analogix_dp_plat_data {
        struct drm_connector *connector;
        bool skip_connector;
 
-       int (*power_on_start)(struct analogix_dp_plat_data *);
-       int (*power_on_end)(struct analogix_dp_plat_data *);
+       int (*power_on)(struct analogix_dp_plat_data *);
        int (*power_off)(struct analogix_dp_plat_data *);
        int (*attach)(struct analogix_dp_plat_data *, struct drm_bridge *,
                      struct drm_connector *);