2018-01-10 22:42:34

by Shuah Khan

Subject: [PATCH v2] leds: ledtrig-transient: Add SPDX license identifiers

Replace GPL license statements with SPDX GPL-2.0 license identifiers
and and correct the module license to GPLv2.

Signed-off-by: Shuah Khan <[email protected]>
---
Changes since v1:
- Changed comment format and updated the entire block to match the
comment format based on Jacek's review.

drivers/leds/trigger/ledtrig-transient.c | 33 +++++++++++++-------------------
1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c
index 7acce64b692a..9d1769073562 100644
--- a/drivers/leds/trigger/ledtrig-transient.c
+++ b/drivers/leds/trigger/ledtrig-transient.c
@@ -1,22 +1,15 @@
-/*
- * LED Kernel Transient Trigger
- *
- * Copyright (C) 2012 Shuah Khan <[email protected]>
- *
- * Based on Richard Purdie's ledtrig-timer.c and Atsushi Nemoto's
- * ledtrig-heartbeat.c
- * Design and use-case input from Jonas Bonn <[email protected]> and
- * Neil Brown <[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.
- *
- */
-/*
- * Transient trigger allows one shot timer activation. Please refer to
- * Documentation/leds/ledtrig-transient.txt for details
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// LED Kernel Transient Trigger
+//
+// Transient trigger allows one shot timer activation. Please refer to
+// Documentation/leds/ledtrig-transient.txt for details
+// Copyright (C) 2012 Shuah Khan <[email protected]>
+//
+// Based on Richard Purdie's ledtrig-timer.c and Atsushi Nemoto's
+// ledtrig-heartbeat.c
+// Design and use-case input from Jonas Bonn <[email protected]> and
+// Neil Brown <[email protected]>

#include <linux/module.h>
#include <linux/kernel.h>
@@ -238,4 +231,4 @@ module_exit(transient_trig_exit);

MODULE_AUTHOR("Shuah Khan <[email protected]>");
MODULE_DESCRIPTION("Transient LED trigger");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
--
2.14.1

2018-01-11 20:32:27

by Jacek Anaszewski

Subject: Re: [PATCH v2] leds: ledtrig-transient: Add SPDX license identifiers

Hi Shuah,

Thanks for the update.

On 01/10/2018 11:42 PM, Shuah Khan wrote:
> Replace GPL license statements with SPDX GPL-2.0 license identifiers
> and and correct the module license to GPLv2.
>
> Signed-off-by: Shuah Khan <[email protected]>
> ---
> Changes since v1:
> - Changed comment format and updated the entire block to match the
> comment format based on Jacek's review.
>
> drivers/leds/trigger/ledtrig-transient.c | 33 +++++++++++++-------------------
> 1 file changed, 13 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c
> index 7acce64b692a..9d1769073562 100644
> --- a/drivers/leds/trigger/ledtrig-transient.c
> +++ b/drivers/leds/trigger/ledtrig-transient.c
> @@ -1,22 +1,15 @@
> -/*
> - * LED Kernel Transient Trigger
> - *
> - * Copyright (C) 2012 Shuah Khan <[email protected]>
> - *
> - * Based on Richard Purdie's ledtrig-timer.c and Atsushi Nemoto's
> - * ledtrig-heartbeat.c
> - * Design and use-case input from Jonas Bonn <[email protected]> and
> - * Neil Brown <[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.
> - *
> - */
> -/*
> - * Transient trigger allows one shot timer activation. Please refer to
> - * Documentation/leds/ledtrig-transient.txt for details
> -*/
> +// SPDX-License-Identifier: GPL-2.0
> +//
> +// LED Kernel Transient Trigger
> +//
> +// Transient trigger allows one shot timer activation. Please refer to
> +// Documentation/leds/ledtrig-transient.txt for details
> +// Copyright (C) 2012 Shuah Khan <[email protected]>
> +//
> +// Based on Richard Purdie's ledtrig-timer.c and Atsushi Nemoto's
> +// ledtrig-heartbeat.c
> +// Design and use-case input from Jonas Bonn <[email protected]> and
> +// Neil Brown <[email protected]>
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> @@ -238,4 +231,4 @@ module_exit(transient_trig_exit);
>
> MODULE_AUTHOR("Shuah Khan <[email protected]>");
> MODULE_DESCRIPTION("Transient LED trigger");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
>

Applied.

--
Best regards,
Jacek Anaszewski