Remove all free-text license texts.
This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.
No copyright headers or other non-license-description text was removed.
Signed-off-by: Peter Rosin <[email protected]>
---
Hi Philipp,
I assume this is ok with you for the mmio file, but asking just in case...
Cheers,
Peter
drivers/mux/Kconfig | 1 +
drivers/mux/Makefile | 1 +
drivers/mux/adg792a.c | 5 +----
drivers/mux/core.c | 5 +----
drivers/mux/gpio.c | 5 +----
drivers/mux/mmio.c | 5 +----
include/linux/mux/consumer.h | 5 +----
include/linux/mux/driver.h | 5 +----
8 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/drivers/mux/Kconfig b/drivers/mux/Kconfig
index 19e4e904c9bf..6241678e99af 100644
--- a/drivers/mux/Kconfig
+++ b/drivers/mux/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Multiplexer devices
#
diff --git a/drivers/mux/Makefile b/drivers/mux/Makefile
index 0e1e59760e3f..c3d883955fd5 100644
--- a/drivers/mux/Makefile
+++ b/drivers/mux/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for multiplexer devices.
#
diff --git a/drivers/mux/adg792a.c b/drivers/mux/adg792a.c
index 12aa221ab90d..6a8725cf3d71 100644
--- a/drivers/mux/adg792a.c
+++ b/drivers/mux/adg792a.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Multiplexer driver for Analog Devices ADG792A/G Triple 4:1 mux
*
* Copyright (C) 2017 Axentia Technologies AB
*
* Author: Peter Rosin <[email protected]>
- *
- * 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/err.h>
diff --git a/drivers/mux/core.c b/drivers/mux/core.c
index 2260063b0ea8..959d22aaa063 100644
--- a/drivers/mux/core.c
+++ b/drivers/mux/core.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Multiplexer subsystem
*
* Copyright (C) 2017 Axentia Technologies AB
*
* Author: Peter Rosin <[email protected]>
- *
- * 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.
*/
#define pr_fmt(fmt) "mux-core: " fmt
diff --git a/drivers/mux/gpio.c b/drivers/mux/gpio.c
index 468bf1709606..6fdd9316db8b 100644
--- a/drivers/mux/gpio.c
+++ b/drivers/mux/gpio.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* GPIO-controlled multiplexer driver
*
* Copyright (C) 2017 Axentia Technologies AB
*
* Author: Peter Rosin <[email protected]>
- *
- * 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/err.h>
diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
index 37c1de359a70..935ac44aa209 100644
--- a/drivers/mux/mmio.c
+++ b/drivers/mux/mmio.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* MMIO register bitfield-controlled multiplexer driver
*
* Copyright (C) 2017 Pengutronix, Philipp Zabel <[email protected]>
- *
- * 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/bitops.h>
diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
index ea96d4c82be7..5fc6bb2fefad 100644
--- a/include/linux/mux/consumer.h
+++ b/include/linux/mux/consumer.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* mux/consumer.h - definitions for the multiplexer consumer interface
*
* Copyright (C) 2017 Axentia Technologies AB
*
* Author: Peter Rosin <[email protected]>
- *
- * 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 _LINUX_MUX_CONSUMER_H
diff --git a/include/linux/mux/driver.h b/include/linux/mux/driver.h
index 35c3579c3304..627a2c6bc02d 100644
--- a/include/linux/mux/driver.h
+++ b/include/linux/mux/driver.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* mux/driver.h - definitions for the multiplexer driver interface
*
* Copyright (C) 2017 Axentia Technologies AB
*
* Author: Peter Rosin <[email protected]>
- *
- * 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 _LINUX_MUX_DRIVER_H
--
2.11.0
On Thu, Dec 7, 2017 at 10:08 PM, Peter Rosin <[email protected]> wrote:
> Remove all free-text license texts.
>
> This is done on a quest to remove the 700+ different ways that files in
> the kernel describe the GPL license text.
>
> No copyright headers or other non-license-description text was removed.
>
> Signed-off-by: Peter Rosin <[email protected]>
> ---
>
> Hi Philipp,
>
> I assume this is ok with you for the mmio file, but asking just in case...
>
> Cheers,
> Peter
>
> drivers/mux/Kconfig | 1 +
> drivers/mux/Makefile | 1 +
> drivers/mux/adg792a.c | 5 +----
> drivers/mux/core.c | 5 +----
> drivers/mux/gpio.c | 5 +----
> drivers/mux/mmio.c | 5 +----
> include/linux/mux/consumer.h | 5 +----
> include/linux/mux/driver.h | 5 +----
> 8 files changed, 8 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/mux/Kconfig b/drivers/mux/Kconfig
> index 19e4e904c9bf..6241678e99af 100644
> --- a/drivers/mux/Kconfig
> +++ b/drivers/mux/Kconfig
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #
> # Multiplexer devices
> #
> diff --git a/drivers/mux/Makefile b/drivers/mux/Makefile
> index 0e1e59760e3f..c3d883955fd5 100644
> --- a/drivers/mux/Makefile
> +++ b/drivers/mux/Makefile
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #
> # Makefile for multiplexer devices.
> #
> diff --git a/drivers/mux/adg792a.c b/drivers/mux/adg792a.c
> index 12aa221ab90d..6a8725cf3d71 100644
> --- a/drivers/mux/adg792a.c
> +++ b/drivers/mux/adg792a.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Multiplexer driver for Analog Devices ADG792A/G Triple 4:1 mux
> *
> * Copyright (C) 2017 Axentia Technologies AB
> *
> * Author: Peter Rosin <[email protected]>
> - *
> - * 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/err.h>
> diff --git a/drivers/mux/core.c b/drivers/mux/core.c
> index 2260063b0ea8..959d22aaa063 100644
> --- a/drivers/mux/core.c
> +++ b/drivers/mux/core.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Multiplexer subsystem
> *
> * Copyright (C) 2017 Axentia Technologies AB
> *
> * Author: Peter Rosin <[email protected]>
> - *
> - * 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.
> */
>
> #define pr_fmt(fmt) "mux-core: " fmt
> diff --git a/drivers/mux/gpio.c b/drivers/mux/gpio.c
> index 468bf1709606..6fdd9316db8b 100644
> --- a/drivers/mux/gpio.c
> +++ b/drivers/mux/gpio.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * GPIO-controlled multiplexer driver
> *
> * Copyright (C) 2017 Axentia Technologies AB
> *
> * Author: Peter Rosin <[email protected]>
> - *
> - * 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/err.h>
> diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
> index 37c1de359a70..935ac44aa209 100644
> --- a/drivers/mux/mmio.c
> +++ b/drivers/mux/mmio.c
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * MMIO register bitfield-controlled multiplexer driver
> *
> * Copyright (C) 2017 Pengutronix, Philipp Zabel <[email protected]>
> - *
> - * 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/bitops.h>
> diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
> index ea96d4c82be7..5fc6bb2fefad 100644
> --- a/include/linux/mux/consumer.h
> +++ b/include/linux/mux/consumer.h
> @@ -1,13 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * mux/consumer.h - definitions for the multiplexer consumer interface
> *
> * Copyright (C) 2017 Axentia Technologies AB
> *
> * Author: Peter Rosin <[email protected]>
> - *
> - * 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 _LINUX_MUX_CONSUMER_H
> diff --git a/include/linux/mux/driver.h b/include/linux/mux/driver.h
> index 35c3579c3304..627a2c6bc02d 100644
> --- a/include/linux/mux/driver.h
> +++ b/include/linux/mux/driver.h
> @@ -1,13 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * mux/driver.h - definitions for the multiplexer driver interface
> *
> * Copyright (C) 2017 Axentia Technologies AB
> *
> * Author: Peter Rosin <[email protected]>
> - *
> - * 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 _LINUX_MUX_DRIVER_H
> --
> 2.11.0
>
Thank you very much for this! FWIW, feel free to add:
Reviewed-by: Philippe Ombredanne <[email protected]>
--
Cordially
Philippe Ombredanne, your friendly kernel licenses scruffy
Hi Peter,
On Thu, 2017-12-07 at 22:08 +0100, Peter Rosin wrote:
> Remove all free-text license texts.
>
> This is done on a quest to remove the 700+ different ways that files in
> the kernel describe the GPL license text.
>
> No copyright headers or other non-license-description text was removed.
>
> Signed-off-by: Peter Rosin <[email protected]>
> ---
>
> Hi Philipp,
>
> I assume this is ok with you for the mmio file, but asking just in case...
[...]
> diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
> index 37c1de359a70..935ac44aa209 100644
> --- a/drivers/mux/mmio.c
> +++ b/drivers/mux/mmio.c
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
Acked-by: Philipp Zabel <[email protected]>
> /*
> * MMIO register bitfield-controlled multiplexer driver
> *
> * Copyright (C) 2017 Pengutronix, Philipp Zabel <[email protected]>
> - *
> - * 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/bitops.h>
> diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
> index ea96d4c82be7..5fc6bb2fefad 100644
> --- a/include/linux/mux/consumer.h
> +++ b/include/linux/mux/consumer.h
> @@ -1,13 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
Is there a system to the different comment styles in c the files vs in
the headers?
regards
Philipp
On 2017-12-08 10:43, Philipp Zabel wrote:
> Hi Peter,
>
> On Thu, 2017-12-07 at 22:08 +0100, Peter Rosin wrote:
>> diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
>> index 37c1de359a70..935ac44aa209 100644
>> --- a/drivers/mux/mmio.c
>> +++ b/drivers/mux/mmio.c
>> @@ -1,11 +1,8 @@
>> +// SPDX-License-Identifier: GPL-2.0
>
> Acked-by: Philipp Zabel <[email protected]>
Thanks!
>> diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
>> index ea96d4c82be7..5fc6bb2fefad 100644
>> --- a/include/linux/mux/consumer.h
>> +++ b/include/linux/mux/consumer.h
>> @@ -1,13 +1,10 @@
>> +/* SPDX-License-Identifier: GPL-2.0 */
>
> Is there a system to the different comment styles in c the files vs in
> the headers?
Yes, headers are sometimes included by assemblers and other tools that
can't handle "new style" comments. I think. I'm just following the lead
set by others...
Cheers,
Peter
Dear Philipp,
On Fri, Dec 8, 2017 at 10:43 AM, Philipp Zabel <[email protected]> wrote:
> Hi Peter,
>
> On Thu, 2017-12-07 at 22:08 +0100, Peter Rosin wrote:
>> Remove all free-text license texts.
>>
>> This is done on a quest to remove the 700+ different ways that files in
>> the kernel describe the GPL license text.
>>
>> No copyright headers or other non-license-description text was removed.
>>
>> Signed-off-by: Peter Rosin <[email protected]>
>> ---
>>
>> Hi Philipp,
>>
>> I assume this is ok with you for the mmio file, but asking just in case...
> [...]
>> diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
>> index 37c1de359a70..935ac44aa209 100644
>> --- a/drivers/mux/mmio.c
>> +++ b/drivers/mux/mmio.c
>> @@ -1,11 +1,8 @@
>> +// SPDX-License-Identifier: GPL-2.0
>
> Acked-by: Philipp Zabel <[email protected]>
>
>> /*
>> * MMIO register bitfield-controlled multiplexer driver
>> *
>> * Copyright (C) 2017 Pengutronix, Philipp Zabel <[email protected]>
>> - *
>> - * 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/bitops.h>
>> diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
>> index ea96d4c82be7..5fc6bb2fefad 100644
>> --- a/include/linux/mux/consumer.h
>> +++ b/include/linux/mux/consumer.h
>> @@ -1,13 +1,10 @@
>> +/* SPDX-License-Identifier: GPL-2.0 */
>
> Is there a system to the different comment styles in c the files vs in
> the headers?
The issue is that some includes are included in assembly. And believe
it or not it makes the build crash in some cases! Greg and Thomas
banged their head on this a bit and decided to go for now with /**/
for includes (and // for the C files which is Linus' preferred style):
he explained why he wants the // comment style and a first line
location on the list too. I think Linus (semi reluctantly) agreed to
the exception for includes because there is no immediate easy way out.
I am sure this could be cleaned up overtime... It feels a tad weird to
include a in.h in a .s ;)
For reference please check Linus [1][2][3], Thomas [4] and Greg [5]
comments on the topic.
Jonathan also wrote a nice background article on the SPDXification
topic at LWN [6]
[1] https://lkml.org/lkml/2017/11/2/715
[2] https://lkml.org/lkml/2017/11/25/125
[3] https://lkml.org/lkml/2017/11/25/133
[4] https://lkml.org/lkml/2017/11/2/805
[5] https://lkml.org/lkml/2017/10/19/165
[6] https://lwn.net/Articles/739183/
--
Cordially
Philippe Ombredanne