[1/5] ASoC: simple-card: convert to SPDX identifiers

Commit Message

Kuninori Morimoto July 2, 2018, 6:30 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

Signed-off-by: Kuninori Morimoto <[e-mail]>
---
 include/sound/simple_card.h     |  7 ++-----
 sound/soc/generic/simple-card.c | 17 +++++++----------
 2 files changed, 9 insertions(+), 15 deletions(-)

Comments

Mark Brown July 2, 2018, 9:48 a.m. UTC | #1

On Mon, Jul 02, 2018 at 06:30:28AM +0000, Kuninori Morimoto wrote:

> +++ b/include/sound/simple_card.h
> @@ -1,12 +1,9 @@
> -/*
> +/* SPDX-License-Identifier: GPL-2.0
> + *
>   * ASoC simple sound card support
>   *

The SPDX identifier needs to be a C++ comment for the tools, and to
maken things look more consistent I prefer that the entire comment get
converted to C++.

Mark Brown July 2, 2018, 9:59 a.m. UTC | #2

On Mon, Jul 02, 2018 at 10:48:52AM +0100, Mark Brown wrote:
> On Mon, Jul 02, 2018 at 06:30:28AM +0000, Kuninori Morimoto wrote:
> 
> > +++ b/include/sound/simple_card.h
> > @@ -1,12 +1,9 @@
> > -/*
> > +/* SPDX-License-Identifier: GPL-2.0
> > + *
> >   * ASoC simple sound card support
> >   *
> 
> The SPDX identifier needs to be a C++ comment for the tools, and to
> maken things look more consistent I prefer that the entire comment get
> converted to C++.

Ugh, sorry - different rule for headers randomly :/

Kuninori Morimoto July 2, 2018, 11:08 p.m. UTC | #3

Hi Mark

> > The SPDX identifier needs to be a C++ comment for the tools, and to
> > maken things look more consistent I prefer that the entire comment get
> > converted to C++.
> 
> Ugh, sorry - different rule for headers randomly :/

Yeah, it is a little bit confusable...

Best regards
---
Kuninori Morimoto

Fabio Estevam July 3, 2018, 3:09 a.m. UTC | #4

On Mon, Jul 2, 2018 at 3:30 AM, Kuninori Morimoto
<[e-mail]> wrote:

> index a6a2e15..d264e54 100644
> --- a/include/sound/simple_card.h
> +++ b/include/sound/simple_card.h
> @@ -1,12 +1,9 @@
> -/*
> +/* SPDX-License-Identifier: GPL-2.0

The first line should be:

/* SPDX-License-Identifier: GPL-2.0 */

as explained in Documentation/process/license-rules.rst

Kuninori Morimoto July 3, 2018, 6:34 a.m. UTC | #5

Hi Fabio

Thank you for your feedback

> > @@ -1,12 +1,9 @@
> > -/*
> > +/* SPDX-License-Identifier: GPL-2.0
> 
> The first line should be:
> 
> /* SPDX-License-Identifier: GPL-2.0 */
> 
> as explained in Documentation/process/license-rules.rst

I double checked below page, and it seems people don't like
that style ?

	Linus Torvalds		- Nov. 25, 2017, 7:11 p.m.
	Pavel Machek		- Nov. 25, 2017, 7:17 p.m.
	Mauro Carvalho Chehab	- Nov. 25, 2017, 7:53 p.m.

	https://patchwork.kernel.org/patch/10062523/

Best regards
---
Kuninori Morimoto

Patch

diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h
index a6a2e15..d264e54 100644
--- a/include/sound/simple_card.h
+++ b/include/sound/simple_card.h
@@ -1,12 +1,9 @@ 
-/*
+/* SPDX-License-Identifier: GPL-2.0
+ *
  * ASoC simple sound card support
  *
  * Copyright (C) 2012 Renesas Solutions Corp.
  * Kuninori Morimoto <[e-mail]>
- *
- * 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 __SIMPLE_CARD_H
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index c5b6e04..64bf356 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -1,13 +1,10 @@ 
-/*
- * ASoC simple sound card support
- *
- * Copyright (C) 2012 Renesas Solutions Corp.
- * Kuninori Morimoto <[e-mail]>
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// ASoC simple sound card support
+//
+// Copyright (C) 2012 Renesas Solutions Corp.
+// Kuninori Morimoto <[e-mail]>
+
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/module.h>