LinuxLists.cc - [PATCH] watchdog: coh901327: make license text and module licence match

2018-02-10 09:28:10

Subject: [PATCH] watchdog: coh901327: make license text and module licence match

Licence text is specifying "GPLv2" but the MODULE_LICENSE is set to "GPLv2
or later".

See include/linux/module.h:
"GPL" [GNU Public License v2 or later]
"GPL v2" [GNU Public License v2]

When on it, add SPDX identifier tag.

Signed-off-by: Marcus Folkesson <[email protected]>
---
drivers/watchdog/coh901327_wdt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c
index 5d8eb9a30879..7b71e0a3e6cc 100644
--- a/drivers/watchdog/coh901327_wdt.c
+++ b/drivers/watchdog/coh901327_wdt.c
@@ -1,8 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* coh901327_wdt.c
*
* Copyright (C) 2008-2009 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
* Watchdog driver for the ST-Ericsson AB COH 901 327 IP core
* Author: Linus Walleij <[email protected]>
*/
@@ -420,5 +420,5 @@ MODULE_DESCRIPTION("COH 901 327 Watchdog");
module_param(margin, uint, 0);
MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)");

-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:coh901327-watchdog");
--
2.15.1

2018-02-10 14:55:01

by Philippe Ombredanne

[permalink] [raw]

Subject: Re: [PATCH] watchdog: coh901327: make license text and module licence match

On Sat, Feb 10, 2018 at 10:27 AM, Marcus Folkesson
<[email protected]> wrote:
> Licence text is specifying "GPLv2" but the MODULE_LICENSE is set to "GPLv2
> or later".
>
> See include/linux/module.h:
> "GPL" [GNU Public License v2 or later]
> "GPL v2" [GNU Public License v2]
>
> When on it, add SPDX identifier tag.
>
> Signed-off-by: Marcus Folkesson <[email protected]>
> ---
> drivers/watchdog/coh901327_wdt.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c
> index 5d8eb9a30879..7b71e0a3e6cc 100644
> --- a/drivers/watchdog/coh901327_wdt.c
> +++ b/drivers/watchdog/coh901327_wdt.c
> @@ -1,8 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * coh901327_wdt.c
> *
> * Copyright (C) 2008-2009 ST-Ericsson AB
> - * License terms: GNU General Public License (GPL) version 2
> * Watchdog driver for the ST-Ericsson AB COH 901 327 IP core
> * Author: Linus Walleij <[email protected]>
> */
> @@ -420,5 +420,5 @@ MODULE_DESCRIPTION("COH 901 327 Watchdog");
> module_param(margin, uint, 0);
> MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)");
>
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> MODULE_ALIAS("platform:coh901327-watchdog");

Thank you!

Reviewed-by: Philippe Ombredanne <[email protected]>

--
Cordially
Philippe Ombredanne

2018-02-10 15:34:09

by Guenter Roeck

[permalink] [raw]

Subject: Re: [PATCH] watchdog: coh901327: make license text and module licence match

On 02/10/2018 01:27 AM, Marcus Folkesson wrote:
> Licence text is specifying "GPLv2" but the MODULE_LICENSE is set to "GPLv2
> or later".
>
> See include/linux/module.h:
> "GPL" [GNU Public License v2 or later]
> "GPL v2" [GNU Public License v2]
>
> When on it, add SPDX identifier tag.
>
> Signed-off-by: Marcus Folkesson <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/watchdog/coh901327_wdt.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c
> index 5d8eb9a30879..7b71e0a3e6cc 100644
> --- a/drivers/watchdog/coh901327_wdt.c
> +++ b/drivers/watchdog/coh901327_wdt.c
> @@ -1,8 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * coh901327_wdt.c
> *
> * Copyright (C) 2008-2009 ST-Ericsson AB
> - * License terms: GNU General Public License (GPL) version 2
> * Watchdog driver for the ST-Ericsson AB COH 901 327 IP core
> * Author: Linus Walleij <[email protected]>
> */
> @@ -420,5 +420,5 @@ MODULE_DESCRIPTION("COH 901 327 Watchdog");
> module_param(margin, uint, 0);
> MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)");
>
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> MODULE_ALIAS("platform:coh901327-watchdog");
>

2018-02-22 14:01:44

by Linus Walleij

[permalink] [raw]