drm/omap: panel-nec-nl8048hl11: remove pdata support (367aa94c) · Commits · 戴 / test

drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c

+5 −39

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		#include <linux/of_gpio.h>

		#include <video/omapdss.h>
		#include <video/omap-panel-data.h>

		struct panel_drv_data {
		struct omap_dss_device dssdev;
		@@ -232,34 +231,6 @@ static struct omap_dss_driver nec_8048_ops = {
		.get_resolution = omapdss_default_get_resolution,
		};


		static int nec_8048_probe_pdata(struct spi_device *spi)
		{
		const struct panel_nec_nl8048hl11_platform_data *pdata;
		struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
		struct omap_dss_device dssdev, in;

		pdata = dev_get_platdata(&spi->dev);

		ddata->qvga_gpio = pdata->qvga_gpio;
		ddata->res_gpio = pdata->res_gpio;

		in = omap_dss_find_output(pdata->source);
		if (in == NULL) {
		dev_err(&spi->dev, "failed to find video source '%s'\n",
		pdata->source);
		return -EPROBE_DEFER;
		}
		ddata->in = in;

		ddata->data_lines = pdata->data_lines;

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

		return 0;
		}

		static int nec_8048_probe_of(struct spi_device *spi)
		{
		struct device_node *node = spi->dev.of_node;
		@@ -315,17 +286,12 @@ static int nec_8048_probe(struct spi_device *spi)

		ddata->spi = spi;

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

		r = nec_8048_probe_of(spi);
		if (r)
		return r;
		} else {
		return -ENODEV;
		}

		if (gpio_is_valid(ddata->qvga_gpio)) {
		r = devm_gpio_request_one(&spi->dev, ddata->qvga_gpio,