linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] crypto: exynos-rng - Add SPDX license identifier and correct module license
@ 2018-01-09 17:57 Krzysztof Kozlowski
  2018-01-09 17:57 ` [PATCH 2/2] crypto: s5p-sss - Add SPDX license identifier Krzysztof Kozlowski
  2018-01-18 12:01 ` [PATCH 1/2] crypto: exynos-rng - Add SPDX license identifier and correct module license Herbert Xu
  0 siblings, 2 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2018-01-09 17:57 UTC (permalink / raw)
  To: linux-arm-kernel

Replace GPL license statement with SPDX GPL-2.0 license identifier and
correct the module license to GPLv2.

The license itself was a generic GPL because of copy-and-paste from old
drivers/char/hw_random/exynos-rng.c driver (on which this was based on).
However the module license indicated GPL-2.0 or later.  GPL-2.0 was
intended by author so fix up this mess.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 drivers/crypto/exynos-rng.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/exynos-rng.c b/drivers/crypto/exynos-rng.c
index 451620b475a0..a2e91f94096f 100644
--- a/drivers/crypto/exynos-rng.c
+++ b/drivers/crypto/exynos-rng.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * exynos-rng.c - Random Number Generator driver for the Exynos
  *
@@ -6,15 +7,6 @@
  * Loosely based on old driver from drivers/char/hw_random/exynos-rng.c:
  * Copyright (C) 2012 Samsung Electronics
  * Jonghwa Lee <jonghwa3.lee@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #include <linux/clk.h>
@@ -386,4 +378,4 @@ module_platform_driver(exynos_rng_driver);
 
 MODULE_DESCRIPTION("Exynos H/W Random Number Generator driver");
 MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/2] crypto: s5p-sss - Add SPDX license identifier
  2018-01-09 17:57 [PATCH 1/2] crypto: exynos-rng - Add SPDX license identifier and correct module license Krzysztof Kozlowski
@ 2018-01-09 17:57 ` Krzysztof Kozlowski
  2018-01-18 12:01 ` [PATCH 1/2] crypto: exynos-rng - Add SPDX license identifier and correct module license Herbert Xu
  1 sibling, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2018-01-09 17:57 UTC (permalink / raw)
  To: linux-arm-kernel

Replace GPL license statement with SPDX GPL-2.0 license identifier.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 drivers/crypto/s5p-sss.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index 62830a43d959..188f44b7eb27 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -1,17 +1,13 @@
-/*
- * Cryptographic API.
- *
- * Support for Samsung S5PV210 and Exynos HW acceleration.
- *
- * Copyright (C) 2011 NetUP Inc. All rights reserved.
- * Copyright (c) 2017 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * 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.
- *
- * Hash part based on omap-sham.c driver.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Cryptographic API.
+//
+// Support for Samsung S5PV210 and Exynos HW acceleration.
+//
+// Copyright (C) 2011 NetUP Inc. All rights reserved.
+// Copyright (c) 2017 Samsung Electronics Co., Ltd. All rights reserved.
+//
+// Hash part based on omap-sham.c driver.
 
 #include <linux/clk.h>
 #include <linux/crypto.h>
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 1/2] crypto: exynos-rng - Add SPDX license identifier and correct module license
  2018-01-09 17:57 [PATCH 1/2] crypto: exynos-rng - Add SPDX license identifier and correct module license Krzysztof Kozlowski
  2018-01-09 17:57 ` [PATCH 2/2] crypto: s5p-sss - Add SPDX license identifier Krzysztof Kozlowski
@ 2018-01-18 12:01 ` Herbert Xu
  1 sibling, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2018-01-18 12:01 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jan 09, 2018 at 06:57:35PM +0100, Krzysztof Kozlowski wrote:
> Replace GPL license statement with SPDX GPL-2.0 license identifier and
> correct the module license to GPLv2.
> 
> The license itself was a generic GPL because of copy-and-paste from old
> drivers/char/hw_random/exynos-rng.c driver (on which this was based on).
> However the module license indicated GPL-2.0 or later.  GPL-2.0 was
> intended by author so fix up this mess.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

All applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-01-18 12:01 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-09 17:57 [PATCH 1/2] crypto: exynos-rng - Add SPDX license identifier and correct module license Krzysztof Kozlowski
2018-01-09 17:57 ` [PATCH 2/2] crypto: s5p-sss - Add SPDX license identifier Krzysztof Kozlowski
2018-01-18 12:01 ` [PATCH 1/2] crypto: exynos-rng - Add SPDX license identifier and correct module license Herbert Xu

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