Hi Tomi,
Thank you for the patch.
On Monday 22 February 2016 19:10:13 Tomi Valkeinen wrote:
We no longer have any boards that require the platform data support from the connector, so we can remove the related code.
Signed-off-by: Tomi Valkeinen tomi.valkeinen@ti.com
drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 55 +++----------------- 1 file changed, 5 insertions(+), 50 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c index d811e6dcaef7..3fd5a0b4d4cf 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c @@ -236,46 +236,6 @@ static struct omap_dss_driver dvic_driver = { .detect = dvic_detect, };
-static int dvic_probe_pdata(struct platform_device *pdev) -{
- struct panel_drv_data *ddata = platform_get_drvdata(pdev);
- struct connector_dvi_platform_data *pdata;
- struct omap_dss_device *in, *dssdev;
- int i2c_bus_num;
- pdata = dev_get_platdata(&pdev->dev);
- i2c_bus_num = pdata->i2c_bus_num;
- if (i2c_bus_num != -1) {
struct i2c_adapter *adapter;adapter = i2c_get_adapter(i2c_bus_num);if (!adapter) {dev_err(&pdev->dev,"Failed to get I2C adapter, bus %d\n",i2c_bus_num);return -EPROBE_DEFER;}ddata->i2c_adapter = adapter;- }
- in = omap_dss_find_output(pdata->source);
- if (in == NULL) {
i2c_put_adapter(ddata->i2c_adapter);dev_err(&pdev->dev, "Failed to find video source\n");return -EPROBE_DEFER;- }
- ddata->in = in;
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
- return 0;
-}
static int dvic_probe_of(struct platform_device *pdev) { struct panel_drv_data *ddata = platform_get_drvdata(pdev); @@ -319,17 +279,12 @@ static int dvic_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ddata);
- if (dev_get_platdata(&pdev->dev)) {
r = dvic_probe_pdata(pdev);if (r)return r;- } else if (pdev->dev.of_node) {
r = dvic_probe_of(pdev);if (r)return r;- } else {
- if (pdev->dev.of_node)
I think you need to invert the condition.
return -ENODEV;
- }
r = dvic_probe_of(pdev);
if (r)
return r;ddata->timings = dvic_default_timings;