Skip to contentSkip to conversation

occ: FSI and hwmon: Fix license headers

PATCH Superseded Eddie James 3 participants 6 messages Jan 21, 2019 – Jan 22, 2019

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Eddie James

author maintainer
#0 lore raw

cover occ: FSI and hwmon: Fix license headers

Source files for the FSI OCC and OCC hwmon drivers had a combination of bad license information and missing IBM copyright. Correct the licenses.

Eddie James (2):
hwmon (occ): Fix license headers
fsi: occ: Fix license header

 drivers/fsi/fsi-occ.c      |  3 ++-
 drivers/hwmon/occ/common.c |  3 ++-
 drivers/hwmon/occ/common.h |  3 ++-
 drivers/hwmon/occ/p8_i2c.c |  3 ++-
 drivers/hwmon/occ/p9_sbe.c |  3 ++-
 drivers/hwmon/occ/sysfs.c  | 13 ++-----------
 6 files changed, 12 insertions(+), 16 deletions(-)
Signature · 1 line
1.8.3.1
author maintainer
#1 lore raw

PATCH 1/2 hwmon (occ): Fix license headers

Files have inconsistent license information.

---
 drivers/hwmon/occ/common.c |  3 ++-
 drivers/hwmon/occ/common.h |  3 ++-
 drivers/hwmon/occ/p8_i2c.c |  3 ++-
 drivers/hwmon/occ/p9_sbe.c |  3 ++-
 drivers/hwmon/occ/sysfs.c  | 13 ++-----------
 5 files changed, 10 insertions(+), 15 deletions(-)
drivers/hwmon/occ/common.c +2 -1
index 391118c..b91a80a 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/hwmon.h>
drivers/hwmon/occ/common.h +2 -1
index 7c44df3..55d4967 100644
@@ -1,4 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #ifndef OCC_COMMON_H
 #define OCC_COMMON_H
drivers/hwmon/occ/p8_i2c.c +2 -1
index b59efc9..76fb787 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/errno.h>
drivers/hwmon/occ/p9_sbe.c +2 -1
index b65c1d1..f6387cc 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/errno.h>
drivers/hwmon/occ/sysfs.c +2 -11
index 743b26ec..fe3d15e 100644
@@ -1,14 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * OCC hwmon driver sysfs interface
- *
- * Copyright (C) IBM Corporation 2018
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/bitops.h>
 #include <linux/device.h>
Signature · 1 line
1.8.3.1
author maintainer
#5 lore raw

PATCH 2/2 fsi: occ: Fix license header

In reply to Eddie James

OCC driver source is missing the IBM Copyright

---
 drivers/fsi/fsi-occ.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/fsi/fsi-occ.c +2 -1
index a2301ce..d75038f 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/err.h>
Signature · 1 line
1.8.3.1
#2 lore raw

Re: [PATCH 1/2] hwmon (occ): Fix license headers

In reply to Eddie James

drivers/hwmon/occ/common.h line 2

Quoted 6 lines · Eddie James
drivers/hwmon/occ/common.h +2 -1
@@ -1,4 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019

We want to use the /* */ syntax for headers. Take a closer look at Documentation/process/license-rules.rst:

2. Style:

The SPDX license identifier is added in form of a comment. The comment style depends on the file type::

C source: // SPDX-License-Identifier: <SPDX License Expression> C header: /* SPDX-License-Identifier: <SPDX License Expression> */

author maintainer
#3 lore raw

Re: [PATCH 1/2] hwmon (occ): Fix license headers

Quoted 10 lines · Joel Stanley

drivers/hwmon/occ/common.h line 2

Quoted 6 lines · Eddie James
drivers/hwmon/occ/common.h +2 -1
@@ -1,4 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019

We want to use the /* */ syntax for headers. Take a closer look at Documentation/process/license-rules.rst:

Oops. Do I put the copyright in the copyright in the same comment block then? Or use // for that?

Quoted 9 lines

2. Style:

The SPDX license identifier is added in form of a comment. The comment style depends on the file type::

C source: // SPDX-License-Identifier: <SPDX License Expression> C header: /* SPDX-License-Identifier: <SPDX License Expression> */

maintainer
#4 lore raw

Re: [PATCH 1/2] hwmon (occ): Fix license headers

Quoted 14 lines · Eddie James
Quoted 10 lines · Joel Stanley

drivers/hwmon/occ/common.h line 2

Quoted 6 lines · Eddie James
drivers/hwmon/occ/common.h +2 -1
@@ -1,4 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019

We want to use the /* */ syntax for headers. Take a closer look at Documentation/process/license-rules.rst:

Quoted 1 line

Oops. Do I put the copyright in the copyright in the same comment block then? Or use // for that?

Separate comment block. The SPDX comment block is expected to be on its own. But please don't make it even more messy than it already is by using // subsequently for the IBM copyright.

Guenter

Quoted 12 lines
Quoted 10 lines

2. Style:

    The SPDX license identifier is added in form of a comment.  The comment style depends on the file type::

       C source: // SPDX-License-Identifier: <SPDX License Expression> C header: /* SPDX-License-Identifier: <SPDX License Expression> */