drm: omapdrm: Remove the omapdss driver

The omapdss driver (not to be confused with the omapdss_dss driver) is
now a dummy driver with empty probe and remove functions. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c
index 6b3247c4f8573b301d96aed0585ec88c1ff83dde..c5d7ffdc7d3585d3650e49eaa8150a7bc477422e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/core.c
+++ b/drivers/gpu/drm/omapdrm/dss/core.c
@@ -24,50 +24,11 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/clk.h>
-#include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/device.h>
-#include <linux/regulator/consumer.h>
-#include <linux/suspend.h>
-#include <linux/slab.h>
 
 #include "omapdss.h"
 #include "dss.h"
 
-static struct {
-       struct platform_device *pdev;
-} core;
-
-enum omapdss_version omapdss_get_version(void)
-{
-       struct omap_dss_board_info *pdata = core.pdev->dev.platform_data;
-       return pdata->version;
-}
-EXPORT_SYMBOL(omapdss_get_version);
-
-/* PLATFORM DEVICE */
-
-static int __init omap_dss_probe(struct platform_device *pdev)
-{
-       core.pdev = pdev;
-
-       return 0;
-}
-
-static int omap_dss_remove(struct platform_device *pdev)
-{
-       return 0;
-}
-
-static struct platform_driver omap_dss_driver = {
-       .remove         = omap_dss_remove,
-       .driver         = {
-               .name   = "omapdss",
-       },
-};
-
 /* INIT */
 static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
        dss_init_platform_driver,
@@ -110,10 +71,6 @@ static int __init omap_dss_init(void)
        int r;
        int i;
 
-       r = platform_driver_probe(&omap_dss_driver, omap_dss_probe);
-       if (r)
-               return r;
-
        for (i = 0; i < ARRAY_SIZE(dss_output_drv_reg_funcs); ++i) {
                r = dss_output_drv_reg_funcs[i]();
                if (r)
@@ -134,8 +91,6 @@ err_reg:
                        ++i)
                dss_output_drv_unreg_funcs[i]();
 
-       platform_driver_unregister(&omap_dss_driver);
-
        return r;
 }
 
@@ -147,8 +102,6 @@ static void __exit omap_dss_exit(void)
 
        for (i = 0; i < ARRAY_SIZE(dss_output_drv_unreg_funcs); ++i)
                dss_output_drv_unreg_funcs[i]();
-
-       platform_driver_unregister(&omap_dss_driver);
 }
 
 module_init(omap_dss_init);

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index dc427aebc88be0f6a1ebd1ab57b69d8834ccf760..47a331670963b2fdffd47a0080e56c09257f3595 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -582,7 +582,6 @@ struct omap_dss_driver {
                const struct hdmi_avi_infoframe *avi);
 };
 
-enum omapdss_version omapdss_get_version(void);
 bool omapdss_is_initialized(void);
 
 int omap_dss_register_driver(struct omap_dss_driver *);