diff mbox

[V1] rtc: GPL copyright inconsistency fix

Message ID 201510021025.t92AP2Bn026715@swsrvapps-01.diasemi.com
State Accepted
Headers show

Commit Message

Steve Twiss Oct. 2, 2015, 10:21 a.m. UTC 
From: Steve Twiss <stwiss.opensource@diasemi.com>

Fix misleading and inconsistent copyright header wording.

Alter the copyright header text and MODULE_LICENSE macro to ensure the
GPL v2 licence description is correctly represented.

It will remove the incorrectly LGPL worded text. Words such as "Library"
from the line "GNU Library General Public License"; and replace the word
"library" with "program" in several other places.

The copyright should match the GPL v2 description as specified in the GNU
license found here: http://www.gnu.org/licenses/gpl-2.0.html

It should also match this copyright text with the correct MODULE_LICENSE
macro text as found in the kernel: include/linux/module.h
In this case "GNU Public License v2 or later" is linked with "GPL".


Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>

---

This patch applies against linux-next and v4.3-rc3 



 drivers/rtc/rtc-da9063.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Alexandre Belloni Oct. 3, 2015, 3:27 p.m. UTC | #1 
On 02/10/2015 at 11:21:11 +0100, Steve Twiss wrote :
> From: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> Fix misleading and inconsistent copyright header wording.
> 
> Alter the copyright header text and MODULE_LICENSE macro to ensure the
> GPL v2 licence description is correctly represented.
> 
> It will remove the incorrectly LGPL worded text. Words such as "Library"
> from the line "GNU Library General Public License"; and replace the word
> "library" with "program" in several other places.
> 
> The copyright should match the GPL v2 description as specified in the GNU
> license found here: http://www.gnu.org/licenses/gpl-2.0.html
> 
> It should also match this copyright text with the correct MODULE_LICENSE
> macro text as found in the kernel: include/linux/module.h
> In this case "GNU Public License v2 or later" is linked with "GPL".
> 

I would have though diasemi would stick to GPL 2 only.

> 
> Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> ---
> 
> This patch applies against linux-next and v4.3-rc3 
> 
> 
> 
>  drivers/rtc/rtc-da9063.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
Applied, thanks.
diff mbox

Patch

diff --git a/drivers/rtc/rtc-da9063.c b/drivers/rtc/rtc-da9063.c
index 00a8f7f..284b587 100644
--- a/drivers/rtc/rtc-da9063.c
+++ b/drivers/rtc/rtc-da9063.c
@@ -1,15 +1,15 @@ 
 /* rtc-da9063.c - Real time clock device driver for DA9063
- * Copyright (C) 2013-14  Dialog Semiconductor Ltd.
+ * Copyright (C) 2013-2015  Dialog Semiconductor Ltd.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include <linux/delay.h>
@@ -516,5 +516,5 @@  module_platform_driver(da9063_rtc_driver);
 
 MODULE_AUTHOR("S Twiss <stwiss.opensource@diasemi.com>");
 MODULE_DESCRIPTION("Real time clock device driver for Dialog DA9063");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" DA9063_DRVNAME_RTC);