| Message ID | 20240503151129.3901815-6-l.stach@pengutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | improve Analogix DP AUX channel handling | expand |
On Fri, May 3, 2024 at 5:13 PM Lucas Stach <l.stach@pengutronix.de> wrote: > > Now that the clock is handled dynamically through > analogix_dp_resume/suspend and it isn't statically enabled in the > driver probe routine, there is no need for the remove function anymore. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 5 ----- > drivers/gpu/drm/exynos/exynos_dp.c | 3 --- > drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 +-------- > include/drm/bridge/analogix_dp.h | 1 - > 4 files changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > index 9e3308257586..9f1dfa6f2175 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > @@ -1813,11 +1813,6 @@ void analogix_dp_unbind(struct analogix_dp_device *dp) > } > EXPORT_SYMBOL_GPL(analogix_dp_unbind); > > -void analogix_dp_remove(struct analogix_dp_device *dp) > -{ > -} > -EXPORT_SYMBOL_GPL(analogix_dp_remove); > - > int analogix_dp_start_crc(struct drm_connector *connector) > { > struct analogix_dp_device *dp = to_dp(connector); > diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c > index 30c8750187ad..097f8c4617de 100644 > --- a/drivers/gpu/drm/exynos/exynos_dp.c > +++ b/drivers/gpu/drm/exynos/exynos_dp.c > @@ -251,10 +251,7 @@ static int exynos_dp_probe(struct platform_device *pdev) > > static void exynos_dp_remove(struct platform_device *pdev) > { > - struct exynos_dp_device *dp = platform_get_drvdata(pdev); > - > component_del(&pdev->dev, &exynos_dp_ops); > - analogix_dp_remove(dp->adp); > } > > static int exynos_dp_suspend(struct device *dev) > diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > index 8214265f1497..362c7951ca4a 100644 > --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > @@ -414,21 +414,14 @@ static int rockchip_dp_probe(struct platform_device *pdev) > > ret = component_add(dev, &rockchip_dp_component_ops); > if (ret) > - goto err_dp_remove; > + return ret; > > return 0; > - > -err_dp_remove: > - analogix_dp_remove(dp->adp); > - return ret; > } > > static void rockchip_dp_remove(struct platform_device *pdev) > { > - struct rockchip_dp_device *dp = platform_get_drvdata(pdev); > - > component_del(&pdev->dev, &rockchip_dp_component_ops); > - analogix_dp_remove(dp->adp); > } > > static int rockchip_dp_suspend(struct device *dev) > diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h > index 8709b6a74c0f..6002c5666031 100644 > --- a/include/drm/bridge/analogix_dp.h > +++ b/include/drm/bridge/analogix_dp.h > @@ -44,7 +44,6 @@ struct analogix_dp_device * > analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data); > int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev); > void analogix_dp_unbind(struct analogix_dp_device *dp); > -void analogix_dp_remove(struct analogix_dp_device *dp); > > int analogix_dp_start_crc(struct drm_connector *connector); > int analogix_dp_stop_crc(struct drm_connector *connector); > -- > 2.39.2 > Reviewed-by: Robert Foss <rfoss@kernel.org>
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 9e3308257586..9f1dfa6f2175 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1813,11 +1813,6 @@ void analogix_dp_unbind(struct analogix_dp_device *dp) } EXPORT_SYMBOL_GPL(analogix_dp_unbind); -void analogix_dp_remove(struct analogix_dp_device *dp) -{ -} -EXPORT_SYMBOL_GPL(analogix_dp_remove); - int analogix_dp_start_crc(struct drm_connector *connector) { struct analogix_dp_device *dp = to_dp(connector); diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c index 30c8750187ad..097f8c4617de 100644 --- a/drivers/gpu/drm/exynos/exynos_dp.c +++ b/drivers/gpu/drm/exynos/exynos_dp.c @@ -251,10 +251,7 @@ static int exynos_dp_probe(struct platform_device *pdev) static void exynos_dp_remove(struct platform_device *pdev) { - struct exynos_dp_device *dp = platform_get_drvdata(pdev); - component_del(&pdev->dev, &exynos_dp_ops); - analogix_dp_remove(dp->adp); } static int exynos_dp_suspend(struct device *dev) diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 8214265f1497..362c7951ca4a 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -414,21 +414,14 @@ static int rockchip_dp_probe(struct platform_device *pdev) ret = component_add(dev, &rockchip_dp_component_ops); if (ret) - goto err_dp_remove; + return ret; return 0; - -err_dp_remove: - analogix_dp_remove(dp->adp); - return ret; } static void rockchip_dp_remove(struct platform_device *pdev) { - struct rockchip_dp_device *dp = platform_get_drvdata(pdev); - component_del(&pdev->dev, &rockchip_dp_component_ops); - analogix_dp_remove(dp->adp); } static int rockchip_dp_suspend(struct device *dev) diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h index 8709b6a74c0f..6002c5666031 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -44,7 +44,6 @@ struct analogix_dp_device * analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data); int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev); void analogix_dp_unbind(struct analogix_dp_device *dp); -void analogix_dp_remove(struct analogix_dp_device *dp); int analogix_dp_start_crc(struct drm_connector *connector); int analogix_dp_stop_crc(struct drm_connector *connector);
Now that the clock is handled dynamically through analogix_dp_resume/suspend and it isn't statically enabled in the driver probe routine, there is no need for the remove function anymore. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 5 ----- drivers/gpu/drm/exynos/exynos_dp.c | 3 --- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 +-------- include/drm/bridge/analogix_dp.h | 1 - 4 files changed, 1 insertion(+), 17 deletions(-)