linux-kernel - Re: [PATCH v2 2/6] staging: iio: adc: ad7606: Use SPDX identifier

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 22 Dec 2018 17:47:19 +0000
From:   Jonathan Cameron <jic23@...nel.org>
To:     Stefan Popa <stefan.popa@...log.com>
Cc:     <robh+dt@...nel.org>, <mark.rutland@....com>,
        <Michael.Hennerich@...log.com>, <knaack.h@....de>,
        <lars@...afoo.de>, <pmeerw@...erw.net>,
        <gregkh@...uxfoundation.org>, <linux-kernel@...r.kernel.org>,
        <linux-iio@...r.kernel.org>, <devel@...verdev.osuosl.org>
Subject: Re: [PATCH v2 2/6] staging: iio: adc: ad7606: Use SPDX identifier

On Mon, 17 Dec 2018 14:23:36 +0200
Stefan Popa <stefan.popa@...log.com> wrote:

> This patch replaces the license text at the top of ad7606 driver files
> and instead adds SPDX GPL-2.0 license identifier.
> 
> Signed-off-by: Stefan Popa <stefan.popa@...log.com>
> ---
>  drivers/staging/iio/adc/ad7606.c     | 5 ++---
>  drivers/staging/iio/adc/ad7606.h     | 3 +--
>  drivers/staging/iio/adc/ad7606_par.c | 5 ++---
>  drivers/staging/iio/adc/ad7606_spi.c | 5 ++---
>  4 files changed, 7 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/staging/iio/adc/ad7606.c b/drivers/staging/iio/adc/ad7606.c
> index e1d85b7..97b4a83 100644
> --- a/drivers/staging/iio/adc/ad7606.c
> +++ b/drivers/staging/iio/adc/ad7606.c
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * AD7606 SPI ADC driver
>   *
>   * Copyright 2011 Analog Devices Inc.
> - *
> - * Licensed under the GPL-2.
>   */
>  
>  #include <linux/interrupt.h>
> @@ -531,4 +530,4 @@ EXPORT_SYMBOL_GPL(ad7606_pm_ops);
>  
>  MODULE_AUTHOR("Michael Hennerich <michael.hennerich@...log.com>");
>  MODULE_DESCRIPTION("Analog Devices AD7606 ADC");
> -MODULE_LICENSE("GPL v2");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/staging/iio/adc/ad7606.h b/drivers/staging/iio/adc/ad7606.h
> index 510a93d..3e12fff 100644
> --- a/drivers/staging/iio/adc/ad7606.h
> +++ b/drivers/staging/iio/adc/ad7606.h
> @@ -1,9 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
>  /*
>   * AD7606 ADC driver
>   *
>   * Copyright 2011 Analog Devices Inc.
> - *
> - * Licensed under the GPL-2.
>   */
>  
>  #ifndef IIO_ADC_AD7606_H_
> diff --git a/drivers/staging/iio/adc/ad7606_par.c b/drivers/staging/iio/adc/ad7606_par.c
> index da26742..2d137b1 100644
> --- a/drivers/staging/iio/adc/ad7606_par.c
> +++ b/drivers/staging/iio/adc/ad7606_par.c
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * AD7606 Parallel Interface ADC driver
>   *
>   * Copyright 2011 Analog Devices Inc.
> - *
> - * Licensed under the GPL-2.
>   */
>  
>  #include <linux/module.h>
> @@ -114,4 +113,4 @@ module_platform_driver(ad7606_driver);
>  
>  MODULE_AUTHOR("Michael Hennerich <michael.hennerich@...log.com>");
>  MODULE_DESCRIPTION("Analog Devices AD7606 ADC");
> -MODULE_LICENSE("GPL v2");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c
> index e533917..f38f0d6 100644
> --- a/drivers/staging/iio/adc/ad7606_spi.c
> +++ b/drivers/staging/iio/adc/ad7606_spi.c
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * AD7606 SPI ADC driver
>   *
>   * Copyright 2011 Analog Devices Inc.
> - *
> - * Licensed under the GPL-2.
>   */
>  
>  #include <linux/module.h>
> @@ -80,4 +79,4 @@ module_spi_driver(ad7606_driver);
>  
>  MODULE_AUTHOR("Michael Hennerich <michael.hennerich@...log.com>");
>  MODULE_DESCRIPTION("Analog Devices AD7606 ADC");
> -MODULE_LICENSE("GPL v2");
> +MODULE_LICENSE("GPL");
Err. Nope. That is "GPL v2 or later"  Guessing accidentally left behind.

I've cleaned up all 3 cases of this whilst applying.   Shout if that
doesn't actually make sense.  Now we have consistent SPDX and MODULE_LICENSE
with all being GPL v2 only.

Thanks,

Jonathan