License cleanup of "my" IIO files

PATCH Applied Peter Rosin 2 participants 11 messages Aug 20, 2018

Subsystems (5)

IIO IIO multiplexer IIO envelope detector IIO digital potentiometer DAC +1 more subsystems

lore

Share & tools

lore

Peter Rosin

author

2018-08-20 10:03 UTC #0 lore raw

cover License cleanup of "my" IIO files

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(-)

Signature · 1 line

2.11.0

Peter Rosin

author

2018-08-20 10:01 UTC #1 lore raw

PATCH 1/5 iio: potentiometer: mcp4018: use the correct MODULE_LICENSE

The file is GPL v2 only.

Signed-off-by Peter Rosin <[email protected]>

---
 drivers/iio/potentiometer/mcp4018.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/iio/potentiometer/mcp4018.c +1 -1

index 320a7c929777..5ab74a839982 100644
@@ -190,4 +190,4 @@ module_i2c_driver(mcp4018_driver);
 
 MODULE_AUTHOR("Peter Rosin <[email protected]>");
 MODULE_DESCRIPTION("MCP4018 digital potentiometer");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

Signature · 1 line

2.11.0

Jonathan Cameron

maintainer

2018-08-20 18:25 UTC #2 lore raw

Re: [PATCH 1/5] iio: potentiometer: mcp4018: use the correct MODULE_LICENSE

Quoted 3 lines · On Mon, 20 Aug 2018 12:01:10 +0200 Peter Rosin <[email protected]> wrote:

The file is GPL v2 only.
Signed-off-by Peter Rosin <[email protected]>

Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it.

thanks,

Jonathan

Quoted 14 lines

---
 drivers/iio/potentiometer/mcp4018.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/iio/potentiometer/mcp4018.c +1 -1

index 320a7c929777..5ab74a839982 100644
@@ -190,4 +190,4 @@ module_i2c_driver(mcp4018_driver);
 
 MODULE_AUTHOR("Peter Rosin <[email protected]>");
 MODULE_DESCRIPTION("MCP4018 digital potentiometer");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

Peter Rosin

author

2018-08-20 10:01 UTC #3 lore raw

PATCH 2/5 iio: potentiometer: mcp4531: switch to SPDX license identifier

In reply to Peter Rosin

Drop the boilerplate license text and use the correct MODULE_LICENSE.

Signed-off-by Peter Rosin <[email protected]>

---
 drivers/iio/potentiometer/mcp4531.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

drivers/iio/potentiometer/mcp4531.c +2 -5

index df894af6cccb..831ad3e7871c 100644
@@ -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 <[email protected]>");
 MODULE_DESCRIPTION("MCP4531 digital potentiometer");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

Signature · 1 line

2.11.0

Jonathan Cameron

maintainer Applied

2018-08-20 18:26 UTC #4 lore raw

Re: [PATCH 2/5] iio: potentiometer: mcp4531: switch to SPDX license identifier

Quoted 3 lines · On Mon, 20 Aug 2018 12:01:11 +0200 Peter Rosin <[email protected]> wrote:

Drop the boilerplate license text and use the correct MODULE_LICENSE.
Signed-off-by Peter Rosin <[email protected]>

Applied.

thanks,

Jonathan

Quoted 30 lines

---
 drivers/iio/potentiometer/mcp4531.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

drivers/iio/potentiometer/mcp4531.c +2 -5

index df894af6cccb..831ad3e7871c 100644
@@ -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 <[email protected]>");
 MODULE_DESCRIPTION("MCP4531 digital potentiometer");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

Peter Rosin

author

2018-08-20 10:01 UTC #5 lore raw

PATCH 3/5 iio: envelope-detector: switch to SPDX license identifier

In reply to Peter Rosin

Drop the boilerplate license text.

Signed-off-by Peter Rosin <[email protected]>

---
 drivers/iio/adc/envelope-detector.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

drivers/iio/adc/envelope-detector.c +1 -4

index 4ebda8ab54fe..2f2b563c1162 100644
@@ -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 <[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.
  */
 
 /*

Signature · 1 line

2.11.0

Jonathan Cameron

maintainer Applied

2018-08-20 18:27 UTC #6 lore raw

Re: [PATCH 3/5] iio: envelope-detector: switch to SPDX license identifier

Quoted 3 lines · On Mon, 20 Aug 2018 12:01:12 +0200 Peter Rosin <[email protected]> wrote:

Drop the boilerplate license text.
Signed-off-by Peter Rosin <[email protected]>

Applied, thanks.

Quoted 23 lines

---
 drivers/iio/adc/envelope-detector.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

drivers/iio/adc/envelope-detector.c +1 -4

index 4ebda8ab54fe..2f2b563c1162 100644
@@ -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 <[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.
  */
 
 /*

Peter Rosin

author

2018-08-20 10:01 UTC #7 lore raw

PATCH 4/5 iio: dpot-dac: switch to SPDX license identifier

In reply to Peter Rosin

Drop the boilerplate license text.

Signed-off-by Peter Rosin <[email protected]>

---
 drivers/iio/dac/dpot-dac.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

drivers/iio/dac/dpot-dac.c +1 -4

index aaa2103d7c2b..a791d0a09d3b 100644
@@ -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 <[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.
  */
 
 /*

Signature · 1 line

2.11.0

Jonathan Cameron

maintainer Applied

2018-08-20 18:28 UTC #8 lore raw

Re: [PATCH 4/5] iio: dpot-dac: switch to SPDX license identifier

Quoted 3 lines · On Mon, 20 Aug 2018 12:01:13 +0200 Peter Rosin <[email protected]> wrote:

Drop the boilerplate license text.
Signed-off-by Peter Rosin <[email protected]>

Applied. Thanks

Quoted 23 lines

---
 drivers/iio/dac/dpot-dac.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

drivers/iio/dac/dpot-dac.c +1 -4

index aaa2103d7c2b..a791d0a09d3b 100644
@@ -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 <[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.
  */
 
 /*

Peter Rosin

author

2018-08-20 10:01 UTC #9 lore raw

PATCH 5/5 iio: multiplexer: switch to SPDX license identifier

In reply to Peter Rosin

Drop the boilerplate license text.

Signed-off-by Peter Rosin <[email protected]>

---
 drivers/iio/multiplexer/iio-mux.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

drivers/iio/multiplexer/iio-mux.c +1 -4

index e1f44cecdef4..0422ef57914c 100644
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IIO 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>

Signature · 1 line

2.11.0

Jonathan Cameron

maintainer Applied

2018-08-20 18:28 UTC #10 lore raw

Re: [PATCH 5/5] iio: multiplexer: switch to SPDX license identifier

Quoted 3 lines · On Mon, 20 Aug 2018 12:01:14 +0200 Peter Rosin <[email protected]> wrote:

Drop the boilerplate license text.
Signed-off-by Peter Rosin <[email protected]>

Applied.

Thanks,

Jonathan

Quoted 23 lines

---
 drivers/iio/multiplexer/iio-mux.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

drivers/iio/multiplexer/iio-mux.c +1 -4

index e1f44cecdef4..0422ef57914c 100644
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IIO 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>