drm/omap: connector-hdmi: remove pdata support (7f7642b5) · Commits · 戴 / test

drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

+5 −34

Original line number	Diff line number	Diff line
		@@ -206,30 +206,6 @@ static struct omap_dss_driver hdmic_driver = {
		.set_hdmi_infoframe = hdmic_set_infoframe,
		};

		static int hdmic_probe_pdata(struct platform_device *pdev)
		{
		struct panel_drv_data *ddata = platform_get_drvdata(pdev);
		struct connector_hdmi_platform_data *pdata;
		struct omap_dss_device in, dssdev;

		pdata = dev_get_platdata(&pdev->dev);

		ddata->hpd_gpio = -ENODEV;

		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;

		dssdev = &ddata->dssdev;
		dssdev->name = pdata->name;

		return 0;
		}

		static int hdmic_probe_of(struct platform_device *pdev)
		{
		struct panel_drv_data *ddata = platform_get_drvdata(pdev);
		@@ -268,17 +244,12 @@ static int hdmic_probe(struct platform_device *pdev)
		platform_set_drvdata(pdev, ddata);
		ddata->dev = &pdev->dev;

		if (dev_get_platdata(&pdev->dev)) {
		r = hdmic_probe_pdata(pdev);
		if (r)
		return r;
		} else if (pdev->dev.of_node) {
		if (!pdev->dev.of_node)
		return -ENODEV;

		r = hdmic_probe_of(pdev);
		if (r)
		return r;
		} else {
		return -ENODEV;
		}

		if (gpio_is_valid(ddata->hpd_gpio)) {
		r = devm_gpio_request_one(&pdev->dev, ddata->hpd_gpio,