From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Tidyup incoherence between MODULE_LICENSE and header license, too
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/sh/rcar/Makefile | 1 + sound/soc/sh/rcar/adg.c | 5 +---- sound/soc/sh/rcar/cmd.c | 5 +---- sound/soc/sh/rcar/core.c | 7 ++----- sound/soc/sh/rcar/ctu.c | 5 +---- sound/soc/sh/rcar/dma.c | 5 +---- sound/soc/sh/rcar/dvc.c | 5 +---- sound/soc/sh/rcar/gen.c | 5 +---- sound/soc/sh/rcar/mix.c | 5 +---- sound/soc/sh/rcar/rsnd.h | 5 +---- sound/soc/sh/rcar/src.c | 5 +---- sound/soc/sh/rcar/ssi.c | 5 +---- sound/soc/sh/rcar/ssiu.c | 5 +---- 13 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/sound/soc/sh/rcar/Makefile b/sound/soc/sh/rcar/Makefile index 9c3d5aed99d1..5d1ff8ef26f9 100644 --- a/sound/soc/sh/rcar/Makefile +++ b/sound/soc/sh/rcar/Makefile @@ -1,2 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 snd-soc-rcar-objs := core.o gen.o dma.o adg.o ssi.o ssiu.o src.o ctu.o mix.o dvc.o cmd.o obj-$(CONFIG_SND_SOC_RCAR) += snd-soc-rcar.o diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 4672688cac32..1f7b701b8b25 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Helper routines for R-Car sound ADG. * * Copyright (C) 2013 Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include <linux/clk-provider.h> #include "rsnd.h" diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c index 4221937ae79b..24082c59f089 100644 --- a/sound/soc/sh/rcar/cmd.c +++ b/sound/soc/sh/rcar/cmd.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas R-Car CMD support * * Copyright (C) 2015 Renesas Solutions Corp. * Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * 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. */ #include "rsnd.h"
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index e6ee5eb685ae..8138857b0d62 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas R-Car SRU/SCU/SSIU/SSI support * @@ -6,10 +7,6 @@ * * Based on fsi.c * Kuninori Morimoto morimoto.kuninori@renesas.com - * - * 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. */
/* @@ -1621,7 +1618,7 @@ static struct platform_driver rsnd_driver = { }; module_platform_driver(rsnd_driver);
-MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("Renesas R-Car audio driver"); MODULE_AUTHOR("Kuninori Morimoto kuninori.morimoto.gx@renesas.com"); MODULE_ALIAS("platform:rcar-pcm-audio"); diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c index d201d551866d..8129391a45fe 100644 --- a/sound/soc/sh/rcar/ctu.c +++ b/sound/soc/sh/rcar/ctu.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * ctu.c * * Copyright (c) 2015 Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * 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. */ #include "rsnd.h"
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index ef82b94d038b..abb6ff6cbd30 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas R-Car Audio DMAC support * * Copyright (C) 2015 Renesas Electronics Corp. * Copyright (c) 2015 Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * 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. */ #include <linux/delay.h> #include <linux/of_dma.h> diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c index dbe54f024d68..91ab003a2a41 100644 --- a/sound/soc/sh/rcar/dvc.c +++ b/sound/soc/sh/rcar/dvc.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas R-Car DVC support * * Copyright (C) 2014 Renesas Solutions Corp. * Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * 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. */
/* diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 25642e92dae0..2e86ca257cc3 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas R-Car Gen1 SRU/SSI support * * Copyright (C) 2013 Renesas Solutions Corp. * Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * 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. */
/* diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c index 7998380766f6..4f7035107d22 100644 --- a/sound/soc/sh/rcar/mix.c +++ b/sound/soc/sh/rcar/mix.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * mix.c * * Copyright (c) 2015 Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * 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. */
/* diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 6d7280d2d9be..094925084c61 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas R-Car * * Copyright (C) 2013 Renesas Solutions Corp. * Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * 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. */ #ifndef RSND_H #define RSND_H diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index a727e71587b6..bef43b6fbd77 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas R-Car SRC support * * Copyright (C) 2013 Renesas Solutions Corp. * Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * 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. */
/* diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 98dd120d830a..bffdd7ba9d37 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas R-Car SSIU/SSI support * @@ -6,10 +7,6 @@ * * Based on fsi.c * Kuninori Morimoto morimoto.kuninori@renesas.com - * - * 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. */
/* diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 6ff8a36c2c82..fddac45b7fa7 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas R-Car SSIU support * * Copyright (c) 2015 Kuninori Morimoto kuninori.morimoto.gx@renesas.com - * - * 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. */ #include "rsnd.h"