[PATCH] ASoC: mt6797: switch to SPDX license tag

[PATCH] ASoC: mt6797: switch to SPDX license tag

[KaiChieh Chuang]

Signed-off-by: KaiChieh Chuang <kaichieh.chuang@mediatek.com>
---
 sound/soc/mediatek/mt6797/Makefile                 | 13 +------------
 sound/soc/mediatek/mt6797/mt6797-afe-clk.c         | 10 +---------
 sound/soc/mediatek/mt6797/mt6797-afe-clk.h         | 10 +---------
 sound/soc/mediatek/mt6797/mt6797-afe-common.h      | 10 +---------
 sound/soc/mediatek/mt6797/mt6797-afe-pcm.c         | 10 +---------
 sound/soc/mediatek/mt6797/mt6797-interconnection.h | 10 +---------
 sound/soc/mediatek/mt6797/mt6797-mt6351.c          | 12 ++----------
 sound/soc/mediatek/mt6797/mt6797-reg.h             | 12 ++----------
 8 files changed, 10 insertions(+), 77 deletions(-)

diff --git a/sound/soc/mediatek/mt6797/Makefile b/sound/soc/mediatek/mt6797/Makefile
index 58618a0d339a..50fd50f7aa6a 100644
--- a/sound/soc/mediatek/mt6797/Makefile
+++ b/sound/soc/mediatek/mt6797/Makefile
@@ -1,15 +1,4 @@
-#
-# Copyright (C) 2018 MediaTek Inc.
-#
-# 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.
-#
+# SPDX-License-Identifier: GPL-2.0
 
 # platform driver
 snd-soc-mt6797-afe-objs := mt6797-afe-pcm.o mt6797-afe-clk.o
diff --git a/sound/soc/mediatek/mt6797/mt6797-afe-clk.c b/sound/soc/mediatek/mt6797/mt6797-afe-clk.c
index f401440b5f70..3fad3ba50fa5 100644
--- a/sound/soc/mediatek/mt6797/mt6797-afe-clk.c
+++ b/sound/soc/mediatek/mt6797/mt6797-afe-clk.c
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mt6797-afe-clk.c  --  Mediatek 6797 afe clock ctrl
  *
  * Copyright (c) 2018 MediaTek Inc.
  * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.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 and
- * only 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.
  */
 
 #include <linux/clk.h>
diff --git a/sound/soc/mediatek/mt6797/mt6797-afe-clk.h b/sound/soc/mediatek/mt6797/mt6797-afe-clk.h
index 43d979402f31..a6f0cb572711 100644
--- a/sound/soc/mediatek/mt6797/mt6797-afe-clk.h
+++ b/sound/soc/mediatek/mt6797/mt6797-afe-clk.h
@@ -1,17 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mt6797-afe-clk.h  --  Mediatek 6797 afe clock ctrl definition
  *
  * Copyright (c) 2018 MediaTek Inc.
  * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.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 and
- * only 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.
  */
 
 #ifndef _MT6797_AFE_CLK_H_
diff --git a/sound/soc/mediatek/mt6797/mt6797-afe-common.h b/sound/soc/mediatek/mt6797/mt6797-afe-common.h
index 3509f53360e2..c1de3fc5dc3d 100644
--- a/sound/soc/mediatek/mt6797/mt6797-afe-common.h
+++ b/sound/soc/mediatek/mt6797/mt6797-afe-common.h
@@ -1,17 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mt6797-afe-common.h  --  Mediatek 6797 audio driver definitions
  *
  * Copyright (c) 2018 MediaTek Inc.
  * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.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 and
- * only 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.
  */
 
 #ifndef _MT_6797_AFE_COMMON_H_
diff --git a/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c b/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c
index 2df7ca4e98da..91ed02dfca08 100644
--- a/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c
+++ b/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Mediatek ALSA SoC AFE platform driver for 6797
  *
  * Copyright (c) 2018 MediaTek Inc.
  * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.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 and
- * only 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.
  */
 
 #include <linux/delay.h>
diff --git a/sound/soc/mediatek/mt6797/mt6797-interconnection.h b/sound/soc/mediatek/mt6797/mt6797-interconnection.h
index 78774cd19383..07b759b20079 100644
--- a/sound/soc/mediatek/mt6797/mt6797-interconnection.h
+++ b/sound/soc/mediatek/mt6797/mt6797-interconnection.h
@@ -1,17 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Mediatek MT6797 audio driver interconnection definition
  *
  * Copyright (c) 2018 MediaTek Inc.
  * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.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 and
- * only 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.
  */
 
 #ifndef _MT6797_INTERCONNECTION_H_
diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
index d42a9d9fbf3e..c3f58bac0960 100644
--- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c
+++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mt6797-mt6351.c  --  MT6797 MT6351 ALSA SoC machine driver
  *
  * Copyright (c) 2018 MediaTek Inc.
- * Author: Ryder Lee <ryder.lee@mediatek.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 and
- * only 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.
+ * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>
  */
 
 #include <linux/module.h>
diff --git a/sound/soc/mediatek/mt6797/mt6797-reg.h b/sound/soc/mediatek/mt6797/mt6797-reg.h
index 3330f73fc8bb..ffb55367f59f 100644
--- a/sound/soc/mediatek/mt6797/mt6797-reg.h
+++ b/sound/soc/mediatek/mt6797/mt6797-reg.h
@@ -1,17 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mt6797-reg.h  --  Mediatek 6797 audio driver reg definition
  *
  * Copyright (c) 2018 MediaTek Inc.
- * Author: Garlic Tseng <garlic.tseng@mediatek.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 and
- * only 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.
+ * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>
  */
 
 #ifndef _MT6797_REG_H_
-- 
2.12.5

Re: [PATCH] ASoC: mt6797: switch to SPDX license tag

[Matthias Brugger]

Hi KaiChieh,

On 04/26/2018 04:56 AM, KaiChieh Chuang wrote:
> diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
> index d42a9d9fbf3e..c3f58bac0960 100644
> --- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c
> +++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
> @@ -1,17 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * mt6797-mt6351.c  --  MT6797 MT6351 ALSA SoC machine driver
>   *
>   * Copyright (c) 2018 MediaTek Inc.
> - * Author: Ryder Lee <ryder.lee@mediatek.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 and
> - * only 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.
> + * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>

I think you don't want to delete the first author but add you as a second one.
I've seen this in other parts of the patch as well. Please check.

Regards,
Matthias

>   */
>  
>  #include <linux/module.h>
> diff --git a/sound/soc/mediatek/mt6797/mt6797-reg.h b/sound/soc/mediatek/mt6797/mt6797-reg.h
> index 3330f73fc8bb..ffb55367f59f 100644
> --- a/sound/soc/mediatek/mt6797/mt6797-reg.h
> +++ b/sound/soc/mediatek/mt6797/mt6797-reg.h
> @@ -1,17 +1,9 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
>  /*
>   * mt6797-reg.h  --  Mediatek 6797 audio driver reg definition
>   *
>   * Copyright (c) 2018 MediaTek Inc.
> - * Author: Garlic Tseng <garlic.tseng@mediatek.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 and
> - * only 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.
> + * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>
>   */
>  
>  #ifndef _MT6797_REG_H_
> 

Re: [PATCH] ASoC: mt6797: switch to SPDX license tag

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 956 bytes --]

On Thu, Apr 26, 2018 at 12:46:54PM +0200, Matthias Brugger wrote:
> On 04/26/2018 04:56 AM, KaiChieh Chuang wrote:
> > diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
> > index d42a9d9fbf3e..c3f58bac0960 100644
> > --- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c
> > +++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
> > @@ -1,17 +1,9 @@
> > +// SPDX-License-Identifier: GPL-2.0
> >  /*
> >   * mt6797-mt6351.c  --  MT6797 MT6351 ALSA SoC machine driver
> >   *

Please convert the entire header block to a C++ comment so it looks more
intentional that it's this way.

> > - * Author: Ryder Lee <ryder.lee@mediatek.com>
> > + * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>

> I think you don't want to delete the first author but add you as a second one.
> I've seen this in other parts of the patch as well. Please check.

Yeah, looks like an over eager removal of the license text boiler
plate.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ASoC: mt6797: switch to SPDX license tag

[Ryder Lee]

On Thu, 2018-04-26 at 12:42 +0100, Mark Brown wrote:
> On Thu, Apr 26, 2018 at 12:46:54PM +0200, Matthias Brugger wrote:
> > On 04/26/2018 04:56 AM, KaiChieh Chuang wrote:
> > > diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
> > > index d42a9d9fbf3e..c3f58bac0960 100644
> > > --- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c
> > > +++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
> > > @@ -1,17 +1,9 @@
> > > +// SPDX-License-Identifier: GPL-2.0
> > >  /*
> > >   * mt6797-mt6351.c  --  MT6797 MT6351 ALSA SoC machine driver
> > >   *
> 
> Please convert the entire header block to a C++ comment so it looks more
> intentional that it's this way.
> 
> > > - * Author: Ryder Lee <ryder.lee@mediatek.com>
> > > + * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>
> 
> > I think you don't want to delete the first author but add you as a second one.
> > I've seen this in other parts of the patch as well. Please check.
> 
> Yeah, looks like an over eager removal of the license text boiler
> plate.

Fine with me. I think this is a copy+paste mistake as I didn't get
involved in MT6797 before.

Re: [PATCH] ASoC: mt6797: switch to SPDX license tag

[Garlic Tseng]

On Thu, 2018-04-26 at 12:46 +0200, Matthias Brugger wrote:
> I think you don't want to delete the first author but add you as a second one.
> I've seen this in other parts of the patch as well. Please check.
> 
> Regards,
> Matthias
> 
> >   */
> >  
> >  #include <linux/module.h>
> > diff --git a/sound/soc/mediatek/mt6797/mt6797-reg.h b/sound/soc/mediatek/mt6797/mt6797-reg.h
> > index 3330f73fc8bb..ffb55367f59f 100644
> > --- a/sound/soc/mediatek/mt6797/mt6797-reg.h
> > +++ b/sound/soc/mediatek/mt6797/mt6797-reg.h
> > @@ -1,17 +1,9 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> >  /*
> >   * mt6797-reg.h  --  Mediatek 6797 audio driver reg definition
> >   *
> >   * Copyright (c) 2018 MediaTek Inc.
> > - * Author: Garlic Tseng <garlic.tseng@mediatek.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 and
> > - * only 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.
> > + * Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>
> >   */
> >  
> >  #ifndef _MT6797_REG_H_
> > 

I don't involve in this code development.
I think treating me as an author is a mistake and fixing it is correct.

Thanks!

Garlic Tseng.