The callbacks in struct dw_mipi_dsi2_host_ops have a struct mipi_dsi_device pointer to the device, which is unused. Remove it as a step towards avoiding DSI host drivers to hold a pointer to the DSI device.
Signed-off-by: Luca Ceresoli <[email protected]> --- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 4 ++-- drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 6 ++---- include/drm/bridge/dw_mipi_dsi2.h | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c index 5926a3a05d79ff42f56adb4d09c7378191493ba1..a994dfc1c0d2f6bbcab615c645d4dff7b90a756f 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c @@ -538,7 +538,7 @@ static int dw_mipi_dsi2_host_attach(struct mipi_dsi_host *host, drm_bridge_add(&dsi2->bridge); if (pdata->host_ops && pdata->host_ops->attach) { - ret = pdata->host_ops->attach(pdata->priv_data, device); + ret = pdata->host_ops->attach(pdata->priv_data); if (ret < 0) return ret; } @@ -554,7 +554,7 @@ static int dw_mipi_dsi2_host_detach(struct mipi_dsi_host *host, int ret; if (pdata->host_ops && pdata->host_ops->detach) { - ret = pdata->host_ops->detach(pdata->priv_data, device); + ret = pdata->host_ops->detach(pdata->priv_data); if (ret < 0) return ret; } diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c index cdd490778756f67be69a5c4319b30520c42cdec8..998cbeb78d15562090910df5a25b3ca9cc60d33a 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c @@ -335,8 +335,7 @@ static const struct component_ops dw_mipi_dsi2_rockchip_ops = { .unbind = dw_mipi_dsi2_rockchip_unbind, }; -static int dw_mipi_dsi2_rockchip_host_attach(void *priv_data, - struct mipi_dsi_device *device) +static int dw_mipi_dsi2_rockchip_host_attach(void *priv_data) { struct dw_mipi_dsi2_rockchip *dsi2 = priv_data; int ret; @@ -348,8 +347,7 @@ static int dw_mipi_dsi2_rockchip_host_attach(void *priv_data, return 0; } -static int dw_mipi_dsi2_rockchip_host_detach(void *priv_data, - struct mipi_dsi_device *device) +static int dw_mipi_dsi2_rockchip_host_detach(void *priv_data) { struct dw_mipi_dsi2_rockchip *dsi2 = priv_data; diff --git a/include/drm/bridge/dw_mipi_dsi2.h b/include/drm/bridge/dw_mipi_dsi2.h index c18c49379247cd5df31a1b014524347b4d92a0a5..0117fe218ea79a30353b2a5949164aa88b18a2b7 100644 --- a/include/drm/bridge/dw_mipi_dsi2.h +++ b/include/drm/bridge/dw_mipi_dsi2.h @@ -54,10 +54,8 @@ struct dw_mipi_dsi2_phy_ops { }; struct dw_mipi_dsi2_host_ops { - int (*attach)(void *priv_data, - struct mipi_dsi_device *dsi); - int (*detach)(void *priv_data, - struct mipi_dsi_device *dsi); + int (*attach)(void *priv_data); + int (*detach)(void *priv_data); }; struct dw_mipi_dsi2_plat_data { -- 2.49.0
