* [PATCH 0/5] License cleanup of "my" IIO files
@ 2018-08-20 10:01 Peter Rosin
2018-08-20 10:01 ` [PATCH 1/5] iio: potentiometer: mcp4018: use the correct MODULE_LICENSE Peter Rosin
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Peter Rosin @ 2018-08-20 10:01 UTC (permalink / raw)
To: linux-kernel
Cc: Peter Rosin, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, linux-iio
Hi!
I found a couple of discrepancies in the license annotations in
some of the files I have added to the drivers/iio/ directory.
This cleans up the trivialities that I found. While at it, convert
the remaining IIO files that are "mine" to SPDX license identifiers.
Cheers,
Peter
Peter Rosin (5):
iio: potentiometer: mcp4018: use the correct MODULE_LICENSE
iio: potentiometer: mcp4531: switch to SPDX license identifier
iio: envelope-detector: switch to SPDX license identifier
iio: dpot-dac: switch to SPDX license identifier
iio: multiplexer: switch to SPDX license identifier
drivers/iio/adc/envelope-detector.c | 5 +----
drivers/iio/dac/dpot-dac.c | 5 +----
drivers/iio/multiplexer/iio-mux.c | 5 +----
drivers/iio/potentiometer/mcp4018.c | 2 +-
drivers/iio/potentiometer/mcp4531.c | 7 ++-----
5 files changed, 6 insertions(+), 18 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/5] iio: potentiometer: mcp4018: use the correct MODULE_LICENSE
2018-08-20 10:01 [PATCH 0/5] License cleanup of "my" IIO files Peter Rosin
@ 2018-08-20 10:01 ` Peter Rosin
2018-08-20 18:25 ` Jonathan Cameron
2018-08-20 10:01 ` [PATCH 2/5] iio: potentiometer: mcp4531: switch to SPDX license identifier Peter Rosin
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Peter Rosin @ 2018-08-20 10:01 UTC (permalink / raw)
To: linux-kernel
Cc: Peter Rosin, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, linux-iio
The file is GPL v2 only.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/iio/potentiometer/mcp4018.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/potentiometer/mcp4018.c b/drivers/iio/potentiometer/mcp4018.c
index 320a7c929777..5ab74a839982 100644
--- a/drivers/iio/potentiometer/mcp4018.c
+++ b/drivers/iio/potentiometer/mcp4018.c
@@ -190,4 +190,4 @@ module_i2c_driver(mcp4018_driver);
MODULE_AUTHOR("Peter Rosin <peda@axentia.se>");
MODULE_DESCRIPTION("MCP4018 digital potentiometer");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/5] iio: potentiometer: mcp4531: switch to SPDX license identifier
2018-08-20 10:01 [PATCH 0/5] License cleanup of "my" IIO files Peter Rosin
2018-08-20 10:01 ` [PATCH 1/5] iio: potentiometer: mcp4018: use the correct MODULE_LICENSE Peter Rosin
@ 2018-08-20 10:01 ` Peter Rosin
2018-08-20 18:26 ` Jonathan Cameron
2018-08-20 10:01 ` [PATCH 3/5] iio: envelope-detector: " Peter Rosin
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Peter Rosin @ 2018-08-20 10:01 UTC (permalink / raw)
To: linux-kernel
Cc: Peter Rosin, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, linux-iio
Drop the boilerplate license text and use the correct MODULE_LICENSE.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/iio/potentiometer/mcp4531.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c
index df894af6cccb..831ad3e7871c 100644
--- a/drivers/iio/potentiometer/mcp4531.c
+++ b/drivers/iio/potentiometer/mcp4531.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Industrial I/O driver for Microchip digital potentiometers
* Copyright (c) 2015 Axentia Technologies AB
@@ -22,10 +23,6 @@
* mcp4652 2 257 5, 10, 50, 100 01011xx
* mcp4661 2 257 5, 10, 50, 100 0101xxx
* mcp4662 2 257 5, 10, 50, 100 01011xx
- *
- * 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/module.h>
@@ -403,4 +400,4 @@ module_i2c_driver(mcp4531_driver);
MODULE_AUTHOR("Peter Rosin <peda@axentia.se>");
MODULE_DESCRIPTION("MCP4531 digital potentiometer");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/5] iio: envelope-detector: switch to SPDX license identifier
2018-08-20 10:01 [PATCH 0/5] License cleanup of "my" IIO files Peter Rosin
2018-08-20 10:01 ` [PATCH 1/5] iio: potentiometer: mcp4018: use the correct MODULE_LICENSE Peter Rosin
2018-08-20 10:01 ` [PATCH 2/5] iio: potentiometer: mcp4531: switch to SPDX license identifier Peter Rosin
@ 2018-08-20 10:01 ` Peter Rosin
2018-08-20 18:27 ` Jonathan Cameron
2018-08-20 10:01 ` [PATCH 4/5] iio: dpot-dac: " Peter Rosin
2018-08-20 10:01 ` [PATCH 5/5] iio: multiplexer: " Peter Rosin
4 siblings, 1 reply; 11+ messages in thread
From: Peter Rosin @ 2018-08-20 10:01 UTC (permalink / raw)
To: linux-kernel
Cc: Peter Rosin, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, linux-iio
Drop the boilerplate license text.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/iio/adc/envelope-detector.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/iio/adc/envelope-detector.c b/drivers/iio/adc/envelope-detector.c
index 4ebda8ab54fe..2f2b563c1162 100644
--- a/drivers/iio/adc/envelope-detector.c
+++ b/drivers/iio/adc/envelope-detector.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Driver for an envelope detector using a DAC and a comparator
*
* Copyright (C) 2016 Axentia Technologies AB
*
* Author: Peter Rosin <peda@axentia.se>
- *
- * 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.
*/
/*
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/5] iio: dpot-dac: switch to SPDX license identifier
2018-08-20 10:01 [PATCH 0/5] License cleanup of "my" IIO files Peter Rosin
` (2 preceding siblings ...)
2018-08-20 10:01 ` [PATCH 3/5] iio: envelope-detector: " Peter Rosin
@ 2018-08-20 10:01 ` Peter Rosin
2018-08-20 18:27 ` Jonathan Cameron
2018-08-20 10:01 ` [PATCH 5/5] iio: multiplexer: " Peter Rosin
4 siblings, 1 reply; 11+ messages in thread
From: Peter Rosin @ 2018-08-20 10:01 UTC (permalink / raw)
To: linux-kernel
Cc: Peter Rosin, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, linux-iio
Drop the boilerplate license text.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/iio/dac/dpot-dac.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/iio/dac/dpot-dac.c b/drivers/iio/dac/dpot-dac.c
index aaa2103d7c2b..a791d0a09d3b 100644
--- a/drivers/iio/dac/dpot-dac.c
+++ b/drivers/iio/dac/dpot-dac.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* IIO DAC emulation driver using a digital potentiometer
*
* Copyright (C) 2016 Axentia Technologies AB
*
* Author: Peter Rosin <peda@axentia.se>
- *
- * 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.
*/
/*
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/5] iio: multiplexer: switch to SPDX license identifier
2018-08-20 10:01 [PATCH 0/5] License cleanup of "my" IIO files Peter Rosin
` (3 preceding siblings ...)
2018-08-20 10:01 ` [PATCH 4/5] iio: dpot-dac: " Peter Rosin
@ 2018-08-20 10:01 ` Peter Rosin
2018-08-20 18:28 ` Jonathan Cameron
4 siblings, 1 reply; 11+ messages in thread
From: Peter Rosin @ 2018-08-20 10:01 UTC (permalink / raw)
To: linux-kernel
Cc: Peter Rosin, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, linux-iio
Drop the boilerplate license text.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/iio/multiplexer/iio-mux.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/iio/multiplexer/iio-mux.c b/drivers/iio/multiplexer/iio-mux.c
index e1f44cecdef4..0422ef57914c 100644
--- a/drivers/iio/multiplexer/iio-mux.c
+++ b/drivers/iio/multiplexer/iio-mux.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* IIO multiplexer driver
*
* Copyright (C) 2017 Axentia Technologies AB
*
* Author: Peter Rosin <peda@axentia.se>
- *
- * 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>
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/5] iio: potentiometer: mcp4018: use the correct MODULE_LICENSE
2018-08-20 10:01 ` [PATCH 1/5] iio: potentiometer: mcp4018: use the correct MODULE_LICENSE Peter Rosin
@ 2018-08-20 18:25 ` Jonathan Cameron
0 siblings, 0 replies; 11+ messages in thread
From: Jonathan Cameron @ 2018-08-20 18:25 UTC (permalink / raw)
To: Peter Rosin
Cc: linux-kernel, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio
On Mon, 20 Aug 2018 12:01:10 +0200
Peter Rosin <peda@axentia.se> wrote:
> The file is GPL v2 only.
>
> Signed-off-by: Peter Rosin <peda@axentia.se>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.
thanks,
Jonathan
> ---
> drivers/iio/potentiometer/mcp4018.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/potentiometer/mcp4018.c b/drivers/iio/potentiometer/mcp4018.c
> index 320a7c929777..5ab74a839982 100644
> --- a/drivers/iio/potentiometer/mcp4018.c
> +++ b/drivers/iio/potentiometer/mcp4018.c
> @@ -190,4 +190,4 @@ module_i2c_driver(mcp4018_driver);
>
> MODULE_AUTHOR("Peter Rosin <peda@axentia.se>");
> MODULE_DESCRIPTION("MCP4018 digital potentiometer");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/5] iio: potentiometer: mcp4531: switch to SPDX license identifier
2018-08-20 10:01 ` [PATCH 2/5] iio: potentiometer: mcp4531: switch to SPDX license identifier Peter Rosin
@ 2018-08-20 18:26 ` Jonathan Cameron
0 siblings, 0 replies; 11+ messages in thread
From: Jonathan Cameron @ 2018-08-20 18:26 UTC (permalink / raw)
To: Peter Rosin
Cc: linux-kernel, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio
On Mon, 20 Aug 2018 12:01:11 +0200
Peter Rosin <peda@axentia.se> wrote:
> Drop the boilerplate license text and use the correct MODULE_LICENSE.
>
> Signed-off-by: Peter Rosin <peda@axentia.se>
Applied.
thanks,
Jonathan
> ---
> drivers/iio/potentiometer/mcp4531.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c
> index df894af6cccb..831ad3e7871c 100644
> --- a/drivers/iio/potentiometer/mcp4531.c
> +++ b/drivers/iio/potentiometer/mcp4531.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Industrial I/O driver for Microchip digital potentiometers
> * Copyright (c) 2015 Axentia Technologies AB
> @@ -22,10 +23,6 @@
> * mcp4652 2 257 5, 10, 50, 100 01011xx
> * mcp4661 2 257 5, 10, 50, 100 0101xxx
> * mcp4662 2 257 5, 10, 50, 100 01011xx
> - *
> - * 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/module.h>
> @@ -403,4 +400,4 @@ module_i2c_driver(mcp4531_driver);
>
> MODULE_AUTHOR("Peter Rosin <peda@axentia.se>");
> MODULE_DESCRIPTION("MCP4531 digital potentiometer");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] iio: envelope-detector: switch to SPDX license identifier
2018-08-20 10:01 ` [PATCH 3/5] iio: envelope-detector: " Peter Rosin
@ 2018-08-20 18:27 ` Jonathan Cameron
0 siblings, 0 replies; 11+ messages in thread
From: Jonathan Cameron @ 2018-08-20 18:27 UTC (permalink / raw)
To: Peter Rosin
Cc: linux-kernel, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio
On Mon, 20 Aug 2018 12:01:12 +0200
Peter Rosin <peda@axentia.se> wrote:
> Drop the boilerplate license text.
>
> Signed-off-by: Peter Rosin <peda@axentia.se>
Applied, thanks.
> ---
> drivers/iio/adc/envelope-detector.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/envelope-detector.c b/drivers/iio/adc/envelope-detector.c
> index 4ebda8ab54fe..2f2b563c1162 100644
> --- a/drivers/iio/adc/envelope-detector.c
> +++ b/drivers/iio/adc/envelope-detector.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Driver for an envelope detector using a DAC and a comparator
> *
> * Copyright (C) 2016 Axentia Technologies AB
> *
> * Author: Peter Rosin <peda@axentia.se>
> - *
> - * 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.
> */
>
> /*
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/5] iio: dpot-dac: switch to SPDX license identifier
2018-08-20 10:01 ` [PATCH 4/5] iio: dpot-dac: " Peter Rosin
@ 2018-08-20 18:27 ` Jonathan Cameron
0 siblings, 0 replies; 11+ messages in thread
From: Jonathan Cameron @ 2018-08-20 18:27 UTC (permalink / raw)
To: Peter Rosin
Cc: linux-kernel, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio
On Mon, 20 Aug 2018 12:01:13 +0200
Peter Rosin <peda@axentia.se> wrote:
> Drop the boilerplate license text.
>
> Signed-off-by: Peter Rosin <peda@axentia.se>
Applied. Thanks
> ---
> drivers/iio/dac/dpot-dac.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/iio/dac/dpot-dac.c b/drivers/iio/dac/dpot-dac.c
> index aaa2103d7c2b..a791d0a09d3b 100644
> --- a/drivers/iio/dac/dpot-dac.c
> +++ b/drivers/iio/dac/dpot-dac.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * IIO DAC emulation driver using a digital potentiometer
> *
> * Copyright (C) 2016 Axentia Technologies AB
> *
> * Author: Peter Rosin <peda@axentia.se>
> - *
> - * 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.
> */
>
> /*
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5/5] iio: multiplexer: switch to SPDX license identifier
2018-08-20 10:01 ` [PATCH 5/5] iio: multiplexer: " Peter Rosin
@ 2018-08-20 18:28 ` Jonathan Cameron
0 siblings, 0 replies; 11+ messages in thread
From: Jonathan Cameron @ 2018-08-20 18:28 UTC (permalink / raw)
To: Peter Rosin
Cc: linux-kernel, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio
On Mon, 20 Aug 2018 12:01:14 +0200
Peter Rosin <peda@axentia.se> wrote:
> Drop the boilerplate license text.
>
> Signed-off-by: Peter Rosin <peda@axentia.se>
Applied.
Thanks,
Jonathan
> ---
> drivers/iio/multiplexer/iio-mux.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/iio/multiplexer/iio-mux.c b/drivers/iio/multiplexer/iio-mux.c
> index e1f44cecdef4..0422ef57914c 100644
> --- a/drivers/iio/multiplexer/iio-mux.c
> +++ b/drivers/iio/multiplexer/iio-mux.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * IIO multiplexer driver
> *
> * Copyright (C) 2017 Axentia Technologies AB
> *
> * Author: Peter Rosin <peda@axentia.se>
> - *
> - * 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>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-08-20 18:28 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-20 10:01 [PATCH 0/5] License cleanup of "my" IIO files Peter Rosin
2018-08-20 10:01 ` [PATCH 1/5] iio: potentiometer: mcp4018: use the correct MODULE_LICENSE Peter Rosin
2018-08-20 18:25 ` Jonathan Cameron
2018-08-20 10:01 ` [PATCH 2/5] iio: potentiometer: mcp4531: switch to SPDX license identifier Peter Rosin
2018-08-20 18:26 ` Jonathan Cameron
2018-08-20 10:01 ` [PATCH 3/5] iio: envelope-detector: " Peter Rosin
2018-08-20 18:27 ` Jonathan Cameron
2018-08-20 10:01 ` [PATCH 4/5] iio: dpot-dac: " Peter Rosin
2018-08-20 18:27 ` Jonathan Cameron
2018-08-20 10:01 ` [PATCH 5/5] iio: multiplexer: " Peter Rosin
2018-08-20 18:28 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).