[alsa-devel] [PATCH 0/8] ASoC: sh: convert SPDX identifiers
Hi Mark
These patches convert license to SPDX identifiers
Kuninori Morimoto (8): ASoC: fsi: convert to SPDX identifiers ASoC: hac: convert to SPDX identifiers ASoC: ssi: convert to SPDX identifiers ASoC: siu: convert to SPDX identifiers ASoC: rsnd: convert to SPDX identifiers ASoC: migor: convert to SPDX identifiers ASoC: dma-sh7760: convert to SPDX identifiers ASoC: sh7760-ac97: convert to SPDX identifiers
sound/soc/sh/dma-sh7760.c | 5 ++--- sound/soc/sh/fsi.c | 5 +---- sound/soc/sh/hac.c | 5 ++--- sound/soc/sh/migor.c | 5 +---- 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 +---- sound/soc/sh/sh7760-ac97.c | 5 ++--- sound/soc/sh/siu.h | 15 +-------------- sound/soc/sh/siu_dai.c | 15 +-------------- sound/soc/sh/siu_pcm.c | 15 +-------------- sound/soc/sh/ssi.c | 6 ++---- 22 files changed, 27 insertions(+), 112 deletions(-)
From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/sh/fsi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 3bae06dd121f..40bafba2f3b3 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Fifo-attached Serial Interface (FSI) support for SH7724 * @@ -6,10 +7,6 @@ * * Based on ssi.c * Copyright (c) 2007 Manuel Lauss mano@roarinelk.homelinux.net - * - * 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>
Hi Kuninori-san,
On Mon, Jun 11, 2018 at 10:11 PM, Kuninori Morimoto kuninori.morimoto.gx@renesas.com wrote:
From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
sound/soc/sh/fsi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 3bae06dd121f..40bafba2f3b3 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /*
- Fifo-attached Serial Interface (FSI) support for SH7724
@@ -6,10 +7,6 @@
- Based on ssi.c
- Copyright (c) 2007 Manuel Lauss mano@roarinelk.homelinux.net
- 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.
Mark prefers that the entire block is converted to // style:
// SPDX-License-Identifier: GPL-2.0 // // Fifo-attached Serial Interface (FSI) support for SH7724 // // Copyright (C) 2009 Renesas Solutions Corp. // Kuninori Morimoto morimoto.kuninori@renesas.com // // Based on ssi.c // Copyright (c) 2007 Manuel Lauss mano@roarinelk.homelinux.net
Hi Fabio
Mark prefers that the entire block is converted to // style:
// SPDX-License-Identifier: GPL-2.0 // // Fifo-attached Serial Interface (FSI) support for SH7724 // // Copyright (C) 2009 Renesas Solutions Corp. // Kuninori Morimoto morimoto.kuninori@renesas.com // // Based on ssi.c // Copyright (c) 2007 Manuel Lauss mano@roarinelk.homelinux.net
Thanks. will post v2
On Tue, 12 Jun 2018 03:15:05 +0200, Fabio Estevam wrote:
Hi Kuninori-san,
On Mon, Jun 11, 2018 at 10:11 PM, Kuninori Morimoto kuninori.morimoto.gx@renesas.com wrote:
From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
sound/soc/sh/fsi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 3bae06dd121f..40bafba2f3b3 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /*
- Fifo-attached Serial Interface (FSI) support for SH7724
@@ -6,10 +7,6 @@
- Based on ssi.c
- Copyright (c) 2007 Manuel Lauss mano@roarinelk.homelinux.net
- 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.
Mark prefers that the entire block is converted to // style:
// SPDX-License-Identifier: GPL-2.0 // // Fifo-attached Serial Interface (FSI) support for SH7724 // // Copyright (C) 2009 Renesas Solutions Corp. // Kuninori Morimoto morimoto.kuninori@renesas.com // // Based on ssi.c // Copyright (c) 2007 Manuel Lauss mano@roarinelk.homelinux.net
... is this really the consensus as the preferred style in the whole Linux kernel tree? To be honest, I find it rather annoying.
It's a food for bikeshed, and in general I'd postpone such changes unless we really have to convert.
thanks,
Takashi
On Tue, Jun 12, 2018 at 3:53 AM, Takashi Iwai tiwai@suse.de wrote:
... is this really the consensus as the preferred style in the whole Linux kernel tree? To be honest, I find it rather annoying.
It's a food for bikeshed, and in general I'd postpone such changes unless we really have to convert.
Putting everything as // is Linus Torvalds' preferred style: https://lkml.org/lkml/2017/11/25/133
Regards,
Fabio Estevam
On Tue, Jun 12, 2018 at 08:53:29AM +0200, Takashi Iwai wrote:
Fabio Estevam wrote:
Hi Kuninori-san,
// SPDX-License-Identifier: GPL-2.0 // // Fifo-attached Serial Interface (FSI) support for SH7724
... is this really the consensus as the preferred style in the whole Linux kernel tree? To be honest, I find it rather annoying.
I'm not a big fan either but at least the first line absolutely needs to be a C++ comment, this has been decided.
It's a food for bikeshed, and in general I'd postpone such changes unless we really have to convert.
Everything is supposed to move to the C++ style comments.
On Tue, 12 Jun 2018 16:07:25 +0200, Mark Brown wrote:
On Tue, Jun 12, 2018 at 08:53:29AM +0200, Takashi Iwai wrote:
Fabio Estevam wrote:
Hi Kuninori-san,
// SPDX-License-Identifier: GPL-2.0 // // Fifo-attached Serial Interface (FSI) support for SH7724
... is this really the consensus as the preferred style in the whole Linux kernel tree? To be honest, I find it rather annoying.
I'm not a big fan either but at least the first line absolutely needs to be a C++ comment, this has been decided.
It's a food for bikeshed, and in general I'd postpone such changes unless we really have to convert.
Everything is supposed to move to the C++ style comments.
Fair enough, let's go ahead in that high way.
thanks,
Takashi
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/hac.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index 624aaf569fef..60406df02249 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Hitachi Audio Controller (AC97) support for SH7760/SH7780 * * Copyright (c) 2007 Manuel Lauss mano@roarinelk.homelinux.net - * licensed under the terms outlined in the file COPYING at the root - * of the linux kernel sources. * * dont forget to set IPSEL/OMSEL register bits (in your board code) to * enable HAC output pins! @@ -343,6 +342,6 @@ static struct platform_driver hac_pcm_driver = {
module_platform_driver(hac_pcm_driver);
-MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("SuperH onchip HAC (AC97) audio driver"); MODULE_AUTHOR("Manuel Lauss mano@roarinelk.homelinux.net");
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/ssi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index 89ed1b107ac5..d477b8617861 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c @@ -1,11 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Serial Sound Interface (I2S) support for SH7760/SH7780 * * Copyright (c) 2007 Manuel Lauss mano@roarinelk.homelinux.net * - * licensed under the terms outlined in the file COPYING at the root - * of the linux kernel sources. - * * dont forget to set IPSEL/OMSEL register bits (in your board code) to * enable SSI output pins! */ @@ -400,6 +398,6 @@ static struct platform_driver sh4_ssi_driver = {
module_platform_driver(sh4_ssi_driver);
-MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("SuperH onchip SSI (I2S) audio driver"); MODULE_AUTHOR("Manuel Lauss mano@roarinelk.homelinux.net");
From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/sh/siu.h | 15 +-------------- sound/soc/sh/siu_dai.c | 15 +-------------- sound/soc/sh/siu_pcm.c | 15 +-------------- 3 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/sound/soc/sh/siu.h b/sound/soc/sh/siu.h index 6088d627c0e4..2a62d7de4db3 100644 --- a/sound/soc/sh/siu.h +++ b/sound/soc/sh/siu.h @@ -1,22 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * siu.h - ALSA SoC driver for Renesas SH7343, SH7722 SIU peripheral. * * Copyright (C) 2009-2010 Guennadi Liakhovetski g.liakhovetski@gmx.de * Copyright (C) 2006 Carlos Munoz carlos@kenati.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifndef SIU_H diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index ee2211635e92..86e73149b1cb 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c @@ -1,22 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * siu_dai.c - ALSA SoC driver for Renesas SH7343, SH7722 SIU peripheral. * * Copyright (C) 2009-2010 Guennadi Liakhovetski g.liakhovetski@gmx.de * Copyright (C) 2006 Carlos Munoz carlos@kenati.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <linux/delay.h> diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index 172909570ed5..009e640e6bd6 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c @@ -1,22 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * siu_pcm.c - ALSA driver for Renesas SH7343, SH7722 SIU peripheral. * * Copyright (C) 2009-2010 Guennadi Liakhovetski g.liakhovetski@gmx.de * Copyright (C) 2006 Carlos Munoz carlos@kenati.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <linux/delay.h> #include <linux/dma-mapping.h>
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"
From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/sh/migor.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index ecb057ff9fbb..0d39ee0c7f5e 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * ALSA SoC driver for Migo-R * * Copyright (C) 2009-2010 Guennadi Liakhovetski g.liakhovetski@gmx.de - * - * 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/clkdev.h>
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/dma-sh7760.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index 2dc3b762fdd9..da6620b81afd 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SH7760 ("camelot") DMABRG audio DMA unit support * * Copyright (C) 2007 Manuel Lauss mano@roarinelk.homelinux.net - * licensed under the terms outlined in the file COPYING at the root - * of the linux kernel sources. * * The SH7760 DMABRG provides 4 dma channels (2x rec, 2x play), which * trigger an interrupt when one half of the programmed transfer size @@ -341,6 +340,6 @@ static struct platform_driver sh7760_pcm_driver = {
module_platform_driver(sh7760_pcm_driver);
-MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("SH7760 Audio DMA (DMABRG) driver"); MODULE_AUTHOR("Manuel Lauss mano@roarinelk.homelinux.net");
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/sh7760-ac97.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c index 4a3568a9bf59..3fa0dc993bfa 100644 --- a/sound/soc/sh/sh7760-ac97.c +++ b/sound/soc/sh/sh7760-ac97.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic AC97 sound support for SH7760 * * (c) 2007 Manuel Lauss - * - * Licensed under the GPLv2. */
#include <linux/module.h> @@ -68,6 +67,6 @@ static void __exit sh7760_ac97_exit(void) module_init(sh7760_ac97_init); module_exit(sh7760_ac97_exit);
-MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("Generic SH7760 AC97 sound machine"); MODULE_AUTHOR("Manuel Lauss mano@roarinelk.homelinux.net");
participants (4)
-
Fabio Estevam -
Kuninori Morimoto -
Mark Brown -
Takashi Iwai