On 03/09/2019 18:34, Laurent Pinchart wrote:
Hi Tomi,
Thank you for the patch.
Missing "Move" in the subject after "dss: " ?
That was intentional to keep the subject short enough. But it looks like it is just bellow 76 chars (80 - 4 char indent) even with "Move" added to it.
BR, Jyri
On Mon, Sep 02, 2019 at 03:53:58PM +0300, Tomi Valkeinen wrote:
From: Jyri Sarha jsarha@ti.com
The core.c just for registering the drivers is kind of useless. Let's get rid of it and register the dss drivers in dss.c.
Signed-off-by: Jyri Sarha jsarha@ti.com Signed-off-by: Tomi Valkeinen tomi.valkeinen@ti.com
Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com
drivers/gpu/drm/omapdrm/dss/Makefile | 2 +- drivers/gpu/drm/omapdrm/dss/core.c | 55 ---------------------------- drivers/gpu/drm/omapdrm/dss/dss.c | 37 +++++++++++++++++++ 3 files changed, 38 insertions(+), 56 deletions(-) delete mode 100644 drivers/gpu/drm/omapdrm/dss/core.c
diff --git a/drivers/gpu/drm/omapdrm/dss/Makefile b/drivers/gpu/drm/omapdrm/dss/Makefile index 904101c5e79d..5950c3f52c2e 100644 --- a/drivers/gpu/drm/omapdrm/dss/Makefile +++ b/drivers/gpu/drm/omapdrm/dss/Makefile @@ -6,7 +6,7 @@ omapdss-base-y := base.o display.o dss-of.o output.o
obj-$(CONFIG_OMAP2_DSS) += omapdss.o # Core DSS files -omapdss-y := core.o dss.o dispc.o dispc_coefs.o \ +omapdss-y := dss.o dispc.o dispc_coefs.o \ pll.o video-pll.o omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c deleted file mode 100644 index 6ac497b63711..000000000000 --- a/drivers/gpu/drm/omapdrm/dss/core.c +++ /dev/null @@ -1,55 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/*
- Copyright (C) 2009 Nokia Corporation
- Author: Tomi Valkeinen tomi.valkeinen@ti.com
- Some code and ideas taken from drivers/video/omap/ driver
- by Imre Deak.
- */
-#define DSS_SUBSYS_NAME "CORE"
-#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/platform_device.h>
-#include "omapdss.h" -#include "dss.h"
-/* INIT */ -static struct platform_driver * const omap_dss_drivers[] = {
- &omap_dsshw_driver,
- &omap_dispchw_driver,
-#ifdef CONFIG_OMAP2_DSS_DSI
- &omap_dsihw_driver,
-#endif -#ifdef CONFIG_OMAP2_DSS_VENC
- &omap_venchw_driver,
-#endif -#ifdef CONFIG_OMAP4_DSS_HDMI
- &omapdss_hdmi4hw_driver,
-#endif -#ifdef CONFIG_OMAP5_DSS_HDMI
- &omapdss_hdmi5hw_driver,
-#endif -};
-static int __init omap_dss_init(void) -{
- return platform_register_drivers(omap_dss_drivers,
ARRAY_SIZE(omap_dss_drivers));-}
-static void __exit omap_dss_exit(void) -{
- platform_unregister_drivers(omap_dss_drivers,
ARRAY_SIZE(omap_dss_drivers));-}
-module_init(omap_dss_init); -module_exit(omap_dss_exit);
-MODULE_AUTHOR("Tomi Valkeinen tomi.valkeinen@ti.com"); -MODULE_DESCRIPTION("OMAP2/3 Display Subsystem"); -MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index e226324adb69..41d495a360d8 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -1598,3 +1598,40 @@ struct platform_driver omap_dsshw_driver = { .suppress_bind_attrs = true, }, };
+/* INIT */ +static struct platform_driver * const omap_dss_drivers[] = {
- &omap_dsshw_driver,
- &omap_dispchw_driver,
+#ifdef CONFIG_OMAP2_DSS_DSI
- &omap_dsihw_driver,
+#endif +#ifdef CONFIG_OMAP2_DSS_VENC
- &omap_venchw_driver,
+#endif +#ifdef CONFIG_OMAP4_DSS_HDMI
- &omapdss_hdmi4hw_driver,
+#endif +#ifdef CONFIG_OMAP5_DSS_HDMI
- &omapdss_hdmi5hw_driver,
+#endif +};
+static int __init omap_dss_init(void) +{
- return platform_register_drivers(omap_dss_drivers,
ARRAY_SIZE(omap_dss_drivers));+}
+static void __exit omap_dss_exit(void) +{
- platform_unregister_drivers(omap_dss_drivers,
ARRAY_SIZE(omap_dss_drivers));+}
+module_init(omap_dss_init); +module_exit(omap_dss_exit);
+MODULE_AUTHOR("Tomi Valkeinen tomi.valkeinen@ti.com"); +MODULE_DESCRIPTION("OMAP2/3/4/5 Display Subsystem"); +MODULE_LICENSE("GPL v2");