drm/omap: dss: Remove output devices list

The output devices list isn't used anymore, all output devices are
accessed through the global devices list. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index a190bcf08738ef538f656c00be03c78f086eab3f..52ceaae14647743998ba23f46a2dd10dc6a3eae6 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -146,7 +146,6 @@ static int opa362_probe(struct platform_device *pdev)
        struct panel_drv_data *ddata;
        struct omap_dss_device *dssdev;
        struct gpio_desc *gpio;
-       int r;
 
        dev_dbg(&pdev->dev, "probe\n");
 
@@ -169,11 +168,7 @@ static int opa362_probe(struct platform_device *pdev)
        dssdev->output_type = OMAP_DISPLAY_TYPE_VENC;
        dssdev->owner = THIS_MODULE;
 
-       r = omapdss_register_output(dssdev);
-       if (r) {
-               dev_err(&pdev->dev, "Failed to register output\n");
-               return r;
-       }
+       omapdss_device_register(dssdev);
 
        return 0;
 }
@@ -183,7 +178,7 @@ static int __exit opa362_remove(struct platform_device *pdev)
        struct panel_drv_data *ddata = platform_get_drvdata(pdev);
        struct omap_dss_device *dssdev = &ddata->dssdev;
 
-       omapdss_unregister_output(&ddata->dssdev);
+       omapdss_device_unregister(&ddata->dssdev);
 
        WARN_ON(omapdss_device_is_enabled(dssdev));
        if (omapdss_device_is_enabled(dssdev))

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index db52eb49cff7ea046d9f7caf9516e9f16014a43d..f4223cf7f03f28450f9aa7525152b256f4ffc135 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -192,11 +192,7 @@ static int tfp410_probe(struct platform_device *pdev)
        dssdev->owner = THIS_MODULE;
        dssdev->port_num = 1;
 
-       r = omapdss_register_output(dssdev);
-       if (r) {
-               dev_err(&pdev->dev, "Failed to register output\n");
-               return r;
-       }
+       omapdss_device_register(dssdev);
 
        return 0;
 }
@@ -206,7 +202,7 @@ static int __exit tfp410_remove(struct platform_device *pdev)
        struct panel_drv_data *ddata = platform_get_drvdata(pdev);
        struct omap_dss_device *dssdev = &ddata->dssdev;
 
-       omapdss_unregister_output(&ddata->dssdev);
+       omapdss_device_unregister(&ddata->dssdev);
 
        WARN_ON(omapdss_device_is_enabled(dssdev));
        if (omapdss_device_is_enabled(dssdev))

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index 4537867f833f06f1d6cee194ee017fcd5cecaf12..90e07036fb48d1a3dc834951c728da380b8d23d4 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -301,11 +301,7 @@ static int tpd_probe(struct platform_device *pdev)
        dssdev->owner = THIS_MODULE;
        dssdev->port_num = 1;
 
-       r = omapdss_register_output(dssdev);
-       if (r) {
-               dev_err(&pdev->dev, "Failed to register output\n");
-               return r;
-       }
+       omapdss_device_register(dssdev);
 
        return 0;
 }
@@ -315,7 +311,7 @@ static int __exit tpd_remove(struct platform_device *pdev)
        struct panel_drv_data *ddata = platform_get_drvdata(pdev);
        struct omap_dss_device *dssdev = &ddata->dssdev;
 
-       omapdss_unregister_output(&ddata->dssdev);
+       omapdss_device_unregister(&ddata->dssdev);
 
        WARN_ON(omapdss_device_is_enabled(dssdev));
        if (omapdss_device_is_enabled(dssdev))

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c
index 22d3818208d7b3fb440d07c364d110ceb3d1996e..8fac816ca481c3ce3e2b2c21b37cb88e477da723 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -63,6 +63,7 @@ void omapdss_device_register(struct omap_dss_device *dssdev)
        list_add_tail(&dssdev->list, &omapdss_devices_list);
        mutex_unlock(&omapdss_devices_lock);
 }
+EXPORT_SYMBOL_GPL(omapdss_device_register);
 
 void omapdss_device_unregister(struct omap_dss_device *dssdev)
 {
@@ -70,6 +71,7 @@ void omapdss_device_unregister(struct omap_dss_device *dssdev)
        list_del(&dssdev->list);
        mutex_unlock(&omapdss_devices_lock);
 }
+EXPORT_SYMBOL_GPL(omapdss_device_unregister);
 
 static bool omapdss_device_is_registered(struct device_node *node)
 {

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index bb7dcd88026f33613e7cf660c2dc3f7b5b04e994..372f1070bd6969e85b2338f58ac9207e53e96566 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -718,7 +718,7 @@ static void dpi_init_output_port(struct dpi_data *dpi, struct device_node *port)
        out->ops = &dpi_ops;
        out->owner = THIS_MODULE;
 
-       omapdss_register_output(out);
+       omapdss_device_register(out);
 }
 
 static void dpi_uninit_output_port(struct device_node *port)
@@ -726,7 +726,7 @@ static void dpi_uninit_output_port(struct device_node *port)
        struct dpi_data *dpi = port->data;
        struct omap_dss_device *out = &dpi->output;
 
-       omapdss_unregister_output(out);
+       omapdss_device_unregister(out);
 }
 
 int dpi_init_port(struct dss_device *dss, struct platform_device *pdev,

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index ac6ec1f20d31c40df2c01e52d8a34be4422e0885..e061816e5381d7bba7db0b85fda6386186f344aa 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4995,14 +4995,14 @@ static void dsi_init_output(struct dsi_data *dsi)
        out->ops = &dsi_ops;
        out->owner = THIS_MODULE;
 
-       omapdss_register_output(out);
+       omapdss_device_register(out);
 }
 
 static void dsi_uninit_output(struct dsi_data *dsi)
 {
        struct omap_dss_device *out = &dsi->output;
 
-       omapdss_unregister_output(out);
+       omapdss_device_unregister(out);
 }
 
 static int dsi_probe_of(struct dsi_data *dsi)

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 7e5474e87c11213bc394e91df90131dd8200a6cf..fa818033f3f332a2ed22a75cf42d255063b3db44 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -565,14 +565,14 @@ static void hdmi_init_output(struct omap_hdmi *hdmi)
        out->ops = &hdmi_ops;
        out->owner = THIS_MODULE;
 
-       omapdss_register_output(out);
+       omapdss_device_register(out);
 }
 
 static void hdmi_uninit_output(struct omap_hdmi *hdmi)
 {
        struct omap_dss_device *out = &hdmi->output;
 
-       omapdss_unregister_output(out);
+       omapdss_device_unregister(out);
 }
 
 static int hdmi_probe_of(struct omap_hdmi *hdmi)

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 86b18ccb8d24888246e6a9cc3819ba8af201d963..ef4a48f397d284deba1c000790b74bf3bfe10e51 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -556,14 +556,14 @@ static void hdmi_init_output(struct omap_hdmi *hdmi)
        out->ops = &hdmi_ops;
        out->owner = THIS_MODULE;
 
-       omapdss_register_output(out);
+       omapdss_device_register(out);
 }
 
 static void hdmi_uninit_output(struct omap_hdmi *hdmi)
 {
        struct omap_dss_device *out = &hdmi->output;
 
-       omapdss_unregister_output(out);
+       omapdss_device_unregister(out);
 }
 
 static int hdmi_probe_of(struct omap_hdmi *hdmi)

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 0033adf534d3acbecfe968a3488042b921fba76d..26abc09f3d4a6db2352dbccad0e633c27a1b8706 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -416,8 +416,6 @@ struct omap_dss_device {
 
        /* OMAP DSS output specific fields */
 
-       struct list_head output_list;
-
        /* DISPC channel for this output */
        enum omap_channel dispc_channel;
        bool dispc_channel_connected;
@@ -510,9 +508,6 @@ int omap_dss_get_num_overlay_managers(void);
 
 int omap_dss_get_num_overlays(void);
 
-int omapdss_register_output(struct omap_dss_device *output);
-void omapdss_unregister_output(struct omap_dss_device *output);
-struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id);
 int omapdss_output_set_device(struct omap_dss_device *out,
                struct omap_dss_device *dssdev);
 int omapdss_output_unset_device(struct omap_dss_device *out);

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 6abdb615a4c0130f8e2d33788a8983a9d912b199..e62da96f83af7db338923ce23466fca4de6dc4f8 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -23,7 +23,6 @@
 
 #include "omapdss.h"
 
-static LIST_HEAD(output_list);
 static DEFINE_MUTEX(output_lock);
 
 int omapdss_output_set_device(struct omap_dss_device *out,
@@ -88,34 +87,6 @@ err:
 }
 EXPORT_SYMBOL(omapdss_output_unset_device);
 
-int omapdss_register_output(struct omap_dss_device *out)
-{
-       list_add_tail(&out->output_list, &output_list);
-       omapdss_device_register(out);
-       return 0;
-}
-EXPORT_SYMBOL(omapdss_register_output);
-
-void omapdss_unregister_output(struct omap_dss_device *out)
-{
-       list_del(&out->output_list);
-       omapdss_device_unregister(out);
-}
-EXPORT_SYMBOL(omapdss_unregister_output);
-
-struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id)
-{
-       struct omap_dss_device *out;
-
-       list_for_each_entry(out, &output_list, output_list) {
-               if (out->id == id)
-                       return out;
-       }
-
-       return NULL;
-}
-EXPORT_SYMBOL(omap_dss_get_output);
-
 struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev)
 {
        while (dssdev->src)

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index e782be2c36bc1ea68179d3d559acde12dce19ad7..2f39e1f47990193221839298ed06adb05683eb3a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -331,12 +331,12 @@ static void sdi_init_output(struct sdi_device *sdi)
        out->ops = &sdi_ops;
        out->owner = THIS_MODULE;
 
-       omapdss_register_output(out);
+       omapdss_device_register(out);
 }
 
 static void sdi_uninit_output(struct sdi_device *sdi)
 {
-       omapdss_unregister_output(&sdi->output);
+       omapdss_device_unregister(&sdi->output);
 }
 
 int sdi_init_port(struct dss_device *dss, struct platform_device *pdev,

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 17668da8ac5ae912628edc1f10577da1fa1c0810..70418cf4eea24e46061c12e599cd4388fabca9f8 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -768,12 +768,12 @@ static void venc_init_output(struct venc_device *venc)
        out->ops = &venc_ops;
        out->owner = THIS_MODULE;
 
-       omapdss_register_output(out);
+       omapdss_device_register(out);
 }
 
 static void venc_uninit_output(struct venc_device *venc)
 {
-       omapdss_unregister_output(&venc->output);
+       omapdss_device_unregister(&venc->output);
 }
 
 static int venc_probe_of(struct venc_device *venc)