On 2023-03-14 13:13:45, Konrad Dybcio wrote:
> Now that the only user is handled by common code, remove the option to
> specify custom handlers through match data.
>
> This is effectively a revert of commit:
> 5ae15e76271 ("drm/msm/dsi: Allow to specify dsi config as pdata")
>
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> Reviewed-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
> ---
> drivers/gpu/drm/msm/dsi/dsi.c | 4 ++--
> drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 ---
> drivers/gpu/drm/msm/dsi/dsi_host.c | 4 ----
> 3 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
> index f761973e4cba..baab79ab6e74 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi.c
> @@ -172,10 +172,10 @@ static int dsi_dev_remove(struct platform_device *pdev)
> }
>
> static const struct of_device_id dt_match[] = {
> - { .compatible = "qcom,mdss-dsi-ctrl", .data = NULL /* autodetect cfg */ },
> + { .compatible = "qcom,mdss-dsi-ctrl" },
>
> /* Deprecated, don't use */
> - { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = NULL },
> + { .compatible = "qcom,dsi-ctrl-6g-qcm2290" },
> {}
> };
>
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h
> index 8772a3631ac1..91bdaf50bb1a 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h
> +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h
> @@ -65,8 +65,5 @@ struct msm_dsi_cfg_handler {
>
> const struct msm_dsi_cfg_handler *msm_dsi_cfg_get(u32 major, u32 minor);
>
> -/* Non autodetect configs */
> -extern const struct msm_dsi_cfg_handler qcm2290_dsi_cfg_handler;
> -
Probably the wrong `fixup!` commit: this should have been part of patch
6 where the struct is removed, not patch 7 (this patch).
- Marijn
> #endif /* __MSM_DSI_CFG_H__ */
>
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
> index 9cfb9e91bfea..961689a255c4 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_host.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
> @@ -214,10 +214,6 @@ static const struct msm_dsi_cfg_handler *dsi_get_config(
> int ret;
> u32 major = 0, minor = 0;
>
> - cfg_hnd = device_get_match_data(dev);
> - if (cfg_hnd)
> - return cfg_hnd;
> -
> ahb_clk = msm_clk_get(msm_host->pdev, "iface");
> if (IS_ERR(ahb_clk)) {
> pr_err("%s: cannot get interface clock\n", __func__);
>
> --
> 2.39.2
>
