[PATCH RFC 7/9] drm/omap: dss: platform_register_drivers() to dss.c and remove core.c

[Laurent Pinchart]

Hi Jyri,

Thank you for the patch.

On Friday, 16 February 2018 13:25:08 EET Jyri Sarha wrote:
> 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 at ti.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> ---
>  drivers/gpu/drm/omapdrm/dss/Makefile |  2 +-
>  drivers/gpu/drm/omapdrm/dss/core.c   | 66 ---------------------------------
>  drivers/gpu/drm/omapdrm/dss/dss.c    | 37 ++++++++++++++++++++
>  3 files changed, 38 insertions(+), 67 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 904101c..5950c3f 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 6c9f667..0000000
> --- a/drivers/gpu/drm/omapdrm/dss/core.c
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -/*
> - * Copyright (C) 2009 Nokia Corporation
> - * Author: Tomi Valkeinen <tomi.valkeinen at nokia.com>
> - *
> - * Some code and ideas taken from drivers/video/omap/ driver
> - * by Imre Deak.
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU General Public License version 2 as published
> by
> - * the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful, but
> WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
> for
> - * more details.
> - *
> - * You should have received a copy of the GNU General Public License along
> with
> - * this program.  If not, see <http://www.gnu.org/licenses/>.
> - */
> -
> -#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 at nokia.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 dda3237..162fa3a 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dss.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dss.c
> @@ -1619,3 +1619,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 at nokia.com>");
> +MODULE_DESCRIPTION("OMAP2/3 Display Subsystem");
> +MODULE_LICENSE("GPL v2");

-- 
Regards,

Laurent Pinchart