[PATCH 05/42] drm/omap: panel-dsi-cm: remove pdata support

[Laurent Pinchart]

Hi Tomi,

Thank you for the patch.
On Monday 22 February 2016 19:10:11 Tomi Valkeinen wrote:
> We no longer have any boards that require the platform data support from
> the panel, so we can remove the related code.
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen at ti.com>
> ---
>  drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 49  +++------------------

I was about to say that you can also remove the definition of the 
panel_dsicm_platform_data structure in include/video/omap-panel-data.h, but 
you have to keep it for the display drivers in the omapfb driver. I wonder 
whether you shouldn't also remove pdata support there as well to be able to 
clean the shared headers. This also applies to patches 06/42 to 13/42.

>  1 file changed, 5 insertions(+), 44 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index
> 3414c2609320..ae7dd625e19f 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> @@ -1127,40 +1127,6 @@ static struct omap_dss_driver dsicm_ops = {
>  	.memory_read	= dsicm_memory_read,
>  };
> 
> -static int dsicm_probe_pdata(struct platform_device *pdev)
> -{
> -	const struct panel_dsicm_platform_data *pdata;
> -	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
> -	struct omap_dss_device *dssdev, *in;
> -
> -	pdata = dev_get_platdata(&pdev->dev);
> -
> -	in = omap_dss_find_output(pdata->source);
> -	if (in == NULL) {
> -		dev_err(&pdev->dev, "failed to find video source\n");
> -		return -EPROBE_DEFER;
> -	}
> -	ddata->in = in;
> -
> -	ddata->reset_gpio = pdata->reset_gpio;
> -
> -	if (pdata->use_ext_te)
> -		ddata->ext_te_gpio = pdata->ext_te_gpio;
> -	else
> -		ddata->ext_te_gpio = -1;
> -
> -	ddata->ulps_timeout = pdata->ulps_timeout;
> -
> -	ddata->use_dsi_backlight = pdata->use_dsi_backlight;
> -
> -	ddata->pin_config = pdata->pin_config;
> -
> -	dssdev = &ddata->dssdev;
> -	dssdev->name = pdata->name;
> -
> -	return 0;
> -}
> -
>  static int dsicm_probe_of(struct platform_device *pdev)
>  {
>  	struct device_node *node = pdev->dev.of_node;
> @@ -1214,17 +1180,12 @@ static int dsicm_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, ddata);
>  	ddata->pdev = pdev;
> 
> -	if (dev_get_platdata(dev)) {
> -		r = dsicm_probe_pdata(pdev);
> -		if (r)
> -			return r;
> -	} else if (pdev->dev.of_node) {
> -		r = dsicm_probe_of(pdev);
> -		if (r)
> -			return r;
> -	} else {
> +	if (pdev->dev.of_node)

Shouldn't you invert the condition ?

>  		return -ENODEV;
> -	}
> +
> +	r = dsicm_probe_of(pdev);
> +	if (r)
> +		return r;
> 
>  	ddata->timings.x_res = 864;
>  	ddata->timings.y_res = 480;

-- 
Regards,

Laurent Pinchart