Skip to contentSkip to conversation

platform/x86: intel_bxtwc_tmu: Convert to use SPDX identifier

PATCH New Andy Shevchenko 1 participant 28 messages Sep 26, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/28 platform/x86: intel_bxtwc_tmu: Convert to use SPDX identifier

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

---
 drivers/platform/x86/intel_bxtwc_tmu.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/platform/x86/intel_bxtwc_tmu.c +2 -11
index 227943a20212..951c105bafc1 100644
@@ -1,21 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * intel_bxtwc_tmu.c - Intel BXT Whiskey Cove PMIC TMU driver
+ * Intel BXT Whiskey Cove PMIC TMU driver
  *
  * Copyright (C) 2016 Intel Corporation. All rights reserved.
  *
  * This driver adds TMU (Time Management Unit) support for Intel BXT platform.
  * It enables the alarm wake-up functionality in the TMU unit of Whiskey Cove
  * PMIC.
- *
- * 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.
- *
- * 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/module.h>
Signature · 1 line
2.19.0
#1 lore raw

PATCH 2/28 platform/x86: intel_cht_int33fe: Convert to use SPDX identifier

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, correct MODULE_LICENSE() string to be aligned with license text.

---
 drivers/platform/x86/intel_cht_int33fe.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/platform/x86/intel_cht_int33fe.c +2 -5
index 39d4100c60a2..6531a0c3cc0d 100644
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel Cherry Trail ACPI INT33FE pseudo device driver
  *
  * Copyright (C) 2017 Hans de Goede <[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.
- *
  * Some Intel Cherry Trail based device which ship with Windows 10, have
  * this weird INT33FE ACPI device with a CRS table with 4 I2cSerialBusV2
  * resources, for 4 different chips attached to various i2c busses:
@@ -266,4 +263,4 @@ module_i2c_driver(cht_int33fe_driver);
 
 MODULE_DESCRIPTION("Intel Cherry Trail ACPI INT33FE pseudo device driver");
 MODULE_AUTHOR("Hans de Goede <[email protected]>");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
Signature · 1 line
2.19.0
#2 lore raw

PATCH 3/28 platform/x86: intel_chtdc_ti_pwrbtn: Add SPDX identifier

In reply to Andy Shevchenko

Driver misses the licence text or identifier, thus, append it here.

---
 drivers/platform/x86/intel_chtdc_ti_pwrbtn.c | 1 +
 1 file changed, 1 insertion(+)
drivers/platform/x86/intel_chtdc_ti_pwrbtn.c +1 -0
index 38b8e7cfe88c..0df2e82dd249 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Power-button driver for Dollar Cove TI PMIC
  * Copyright (C) 2014 Intel Corp
Signature · 1 line
2.19.0
#3 lore raw

PATCH 4/28 platform/x86: intel-hid: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

---
 drivers/platform/x86/intel-hid.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/platform/x86/intel-hid.c +1 -11
index 6cf9b7fa5bf0..e28bcf61b126 100644
@@ -1,19 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  Intel HID event & 5 button array driver
  *
  *  Copyright (C) 2015 Alex Hung <[email protected]>
  *  Copyright (C) 2015 Andrew Lutomirski <[email protected]>
- *
- *  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 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/acpi.h>
Signature · 1 line
2.19.0
#4 lore raw

PATCH 5/28 platform/x86: intel_int0002_vgpio: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, correct MODULE_LICENSE() string to be aligned with license text.

---
 drivers/platform/x86/intel_int0002_vgpio.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/platform/x86/intel_int0002_vgpio.c +2 -5
index 33c3489f5bc1..c958a628c375 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel INT0002 "Virtual GPIO" driver
  *
@@ -9,10 +10,6 @@
  *
  * Author: Dyut Kumar Sil <[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.
- *
  * Some peripherals on Bay Trail and Cherry Trail platforms signal a Power
  * Management Event (PME) to the Power Management Controller (PMC) to wakeup
  * the system. When this happens software needs to clear the PME bus 0 status
@@ -228,4 +225,4 @@ module_platform_driver(int0002_driver);
 
 MODULE_AUTHOR("Hans de Goede <[email protected]>");
 MODULE_DESCRIPTION("Intel INT0002 Virtual GPIO driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
Signature · 1 line
2.19.0
#5 lore raw

PATCH 6/28 platform/x86: intel-ips: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, correct MODULE_LICENSE() string to be aligned with license text.

---
 drivers/platform/x86/intel_ips.c | 15 ++-------------
 drivers/platform/x86/intel_ips.h | 13 +------------
 2 files changed, 3 insertions(+), 25 deletions(-)
drivers/platform/x86/intel_ips.c +2 -13
index c5ece7ef08c6..225638a1b09e 100644
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2009-2010 Intel Corporation
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
  * Authors:
  *	Jesse Barnes <[email protected]>
  */
@@ -1697,6 +1686,6 @@ static struct pci_driver ips_pci_driver = {
 
 module_pci_driver(ips_pci_driver);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Jesse Barnes <[email protected]>");
 MODULE_DESCRIPTION("Intelligent Power Sharing Driver");
drivers/platform/x86/intel_ips.h +1 -12
index 60f4e3ddbe9f..512ad234ad0d 100644
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2010 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
  */
 
 void ips_link_to_i915_driver(void);
Signature · 1 line
2.19.0
#6 lore raw

PATCH 7/28 platform/x86: intel_menlow: Sort headers alphabetically

In reply to Andy Shevchenko

Sort headers alphabetically for better maintenance.

No functional change.

While here, remove unneeded linux/init.h inclusion.

---
 drivers/platform/x86/intel_menlow.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/platform/x86/intel_menlow.c +3 -4
index ef9b0af8cdd3..76854f0bf70b 100644
@@ -29,15 +29,14 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/acpi.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/pm.h>
+#include <linux/slab.h>
 #include <linux/thermal.h>
-#include <linux/acpi.h>
+#include <linux/types.h>
 
 MODULE_AUTHOR("Thomas Sujith");
 MODULE_AUTHOR("Zhang Rui");
Signature · 1 line
2.19.0
#7 lore raw

PATCH 8/28 platform/x86: intel_menlow: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, correct MODULE_LICENSE() string to be aligned with license text.

---
 drivers/platform/x86/intel_menlow.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)
drivers/platform/x86/intel_menlow.c +3 -18
index 76854f0bf70b..77eb8709c931 100644
@@ -1,25 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- *  intel_menlow.c - Intel menlow Driver for thermal management extension
+ *  Intel menlow Driver for thermal management extension
  *
  *  Copyright (C) 2008 Intel Corp
  *  Copyright (C) 2008 Sujith Thomas <[email protected]>
  *  Copyright (C) 2008 Zhang Rui <[email protected]>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
  *  This driver creates the sys I/F for programming the sensors.
  *  It also implements the driver for intel menlow memory controller (hardware
@@ -41,7 +26,7 @@
 MODULE_AUTHOR("Thomas Sujith");
 MODULE_AUTHOR("Zhang Rui");
 MODULE_DESCRIPTION("Intel Menlow platform specific driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 
 /*
  * Memory controller device control
Signature · 1 line
2.19.0
#8 lore raw

PATCH 9/28 platform/x86: intel_mid_powerbtn: Remove unnecessary init.h inclusion

In reply to Andy Shevchenko

No need to include linux/init.h when linux/module.h is.

No functional change intended.

---
 drivers/platform/x86/intel_mid_powerbtn.c | 1 -
 1 file changed, 1 deletion(-)
drivers/platform/x86/intel_mid_powerbtn.c +0 -1
index c93299002169..b8d659233c6a 100644
@@ -16,7 +16,6 @@
  * General Public License for more details.
  */
 
-#include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/intel_msic.h>
Signature · 1 line
2.19.0
#9 lore raw

PATCH 10/28 platform/x86: intel_mid_powerbtn: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

---
 drivers/platform/x86/intel_mid_powerbtn.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/platform/x86/intel_mid_powerbtn.c +1 -9
index b8d659233c6a..a8c0fbb7f799 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Power button driver for Intel MID platforms.
  *
@@ -5,15 +6,6 @@
  *
  * Author: Hong Liu <[email protected]>
  * Author: Andy Shevchenko <[email protected]>
- *
- * 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; version 2 of the License.
- *
- * 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/input.h>
Signature · 1 line
2.19.0
#10 lore raw

PATCH 11/28 platform/x86: intel_mid_thermal: Sort headers alphabetically

In reply to Andy Shevchenko

Sort headers alphabetically for better maintenance.

No functional change.

While here, remove unneeded linux/init.h inclusion.

---
 drivers/platform/x86/intel_mid_thermal.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/platform/x86/intel_mid_thermal.c +4 -5
index 008a76903cbf..3fa8207dd34e 100644
@@ -24,16 +24,15 @@
 
 #define pr_fmt(fmt) "intel_mid_thermal: " fmt
 
-#include <linux/module.h>
-#include <linux/init.h>
+#include <linux/device.h>
 #include <linux/err.h>
+#include <linux/mfd/intel_msic.h>
+#include <linux/module.h>
 #include <linux/param.h>
-#include <linux/device.h>
 #include <linux/platform_device.h>
-#include <linux/slab.h>
 #include <linux/pm.h>
+#include <linux/slab.h>
 #include <linux/thermal.h>
-#include <linux/mfd/intel_msic.h>
 
 /* Number of thermal sensors */
 #define MSIC_THERMAL_SENSORS	4
Signature · 1 line
2.19.0
#11 lore raw

PATCH 12/28 platform/x86: intel_mid_thermal: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, correct MODULE_LICENSE() string to be aligned with license text.

---
 drivers/platform/x86/intel_mid_thermal.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)
drivers/platform/x86/intel_mid_thermal.c +3 -18
index 3fa8207dd34e..f402e2e74a38 100644
@@ -1,24 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * intel_mid_thermal.c - Intel MID platform thermal driver
+ * Intel MID platform thermal driver
  *
  * Copyright (C) 2011 Intel Corporation
  *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * 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; version 2 of the License.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Author: Durgadoss R <[email protected]>
  */
 
@@ -566,4 +551,4 @@ module_platform_driver(mid_thermal_driver);
 
 MODULE_AUTHOR("Durgadoss R <[email protected]>");
 MODULE_DESCRIPTION("Intel Medfield Platform Thermal Driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
Signature · 1 line
2.19.0
#12 lore raw

PATCH 13/28 platform/x86: intel_oaktrail: Sort headers alphabetically

In reply to Andy Shevchenko

Sort headers alphabetically for better maintenance.

No functional change.

While here, remove unneeded linux/init.h inclusion.

---
 drivers/platform/x86/intel_oaktrail.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/platform/x86/intel_oaktrail.c +7 -7
index 5747f63c8d9f..1d98fd9ca1ea 100644
@@ -38,18 +38,18 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/acpi.h>
-#include <linux/fb.h>
-#include <linux/mutex.h>
+#include <linux/backlight.h>
+#include <linux/dmi.h>
 #include <linux/err.h>
+#include <linux/fb.h>
 #include <linux/i2c.h>
-#include <linux/backlight.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/platform_device.h>
-#include <linux/dmi.h>
 #include <linux/rfkill.h>
+
 #include <acpi/video.h>
 
 #define DRIVER_NAME	"intel_oaktrail"
Signature · 1 line
2.19.0
#13 lore raw

PATCH 14/28 platform/x86: intel_oaktrail: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

---
 drivers/platform/x86/intel_oaktrail.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/platform/x86/intel_oaktrail.c +2 -16
index 1d98fd9ca1ea..3c0438ba385e 100644
@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * intel_oaktrail.c - Intel OakTrail Platform support.
+ * Intel OakTrail Platform support
  *
  * Copyright (C) 2010-2011 Intel Corporation
  * Author: Yin Kangkai ([email protected])
@@ -8,21 +9,6 @@
  * <cezary.jackiewicz (at) gmail.com>, based on MSI driver
  * Copyright (C) 2006 Lennart Poettering <mzxreary (at) 0pointer (dot) de>
  *
- *  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 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- *  02110-1301, USA.
- *
  * This driver does below things:
  * 1. registers itself in the Linux backlight control in
  *    /sys/class/backlight/intel_oaktrail/
Signature · 1 line
2.19.0
#14 lore raw

PATCH 15/28 platform/x86: intel_pmc: Sort headers alphabetically

In reply to Andy Shevchenko

Sort headers alphabetically for better maintenance.

No functional change.

While here, remove unneeded linux/init.h inclusion.

---
 drivers/platform/x86/intel_pmc_ipc.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/platform/x86/intel_pmc_ipc.c +11 -12
index e7edc8c63936..8b88e1743e41 100644
@@ -15,25 +15,24 @@
  * core through IPC mechanism which in turn messaging between IA core ad PMC.
  */
 
-#include <linux/module.h>
+#include <linux/acpi.h>
+#include <linux/atomic.h>
+#include <linux/bitops.h>
 #include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/init.h>
 #include <linux/device.h>
-#include <linux/pm.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/notifier.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
-#include <linux/interrupt.h>
+#include <linux/pm.h>
 #include <linux/pm_qos.h>
-#include <linux/kernel.h>
-#include <linux/bitops.h>
 #include <linux/sched.h>
-#include <linux/atomic.h>
-#include <linux/notifier.h>
-#include <linux/suspend.h>
-#include <linux/acpi.h>
-#include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/spinlock.h>
+#include <linux/suspend.h>
 
 #include <asm/intel_pmc_ipc.h>
 
Signature · 1 line
2.19.0
#15 lore raw

PATCH 16/28 platform/x86: intel_pmc: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, correct MODULE_LICENSE() string to be aligned with license text.

---
 drivers/platform/x86/intel_pmc_core.c | 11 +----------
 drivers/platform/x86/intel_pmc_core.h | 11 +----------
 drivers/platform/x86/intel_pmc_ipc.c  | 12 ++++--------
 3 files changed, 6 insertions(+), 28 deletions(-)
drivers/platform/x86/intel_pmc_core.c +1 -10
index 2d272a3e0176..6b31d410cb09 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel Core SoC Power Management Controller Driver
  *
@@ -6,16 +7,6 @@
  *
  * Authors: Rajneesh Bhardwaj <[email protected]>
  *          Vishwanath Somayaji <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
drivers/platform/x86/intel_pmc_core.h +1 -10
index 93a7e99e1f8b..be045348ad86 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel Core SoC Power Management Controller Header File
  *
@@ -6,16 +7,6 @@
  *
  * Authors: Rajneesh Bhardwaj <[email protected]>
  *          Vishwanath Somayaji <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
  */
 
 #ifndef PMC_CORE_H
drivers/platform/x86/intel_pmc_ipc.c +4 -8
index 8b88e1743e41..7964ba22ef8d 100644
@@ -1,16 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * intel_pmc_ipc.c: Driver for the Intel PMC IPC mechanism
+ * Driver for the Intel PMC IPC mechanism
  *
  * (C) Copyright 2014-2015 Intel Corporation
  *
- * This driver is based on Intel SCU IPC driver(intel_scu_opc.c) by
+ * This driver is based on Intel SCU IPC driver(intel_scu_ipc.c) by
  *     Sreedhara DS <[email protected]>
  *
- * 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; version 2
- * of the License.
- *
  * PMC running in ARC processor communicates with other entity running in IA
  * core through IPC mechanism which in turn messaging between IA core ad PMC.
  */
@@ -1028,7 +1024,7 @@ static void __exit intel_pmc_ipc_exit(void)
 
 MODULE_AUTHOR("Zha Qipeng <[email protected]>");
 MODULE_DESCRIPTION("Intel PMC IPC driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 
 /* Some modules are dependent on this, so init earlier */
 fs_initcall(intel_pmc_ipc_init);
Signature · 1 line
2.19.0
#16 lore raw

PATCH 17/28 platform/x86: intel_punit_ipc: Sort headers alphabetically

In reply to Andy Shevchenko

Sort headers alphabetically for better maintenance.

No functional change.

---
 drivers/platform/x86/intel_punit_ipc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/platform/x86/intel_punit_ipc.c +4 -3
index 2efeab650345..8eaa60c9ad69 100644
@@ -11,15 +11,16 @@
  * which provide mailbox interface for power management usage.
  */
 
-#include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/acpi.h>
-#include <linux/delay.h>
 #include <linux/bitops.h>
+#include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
+
 #include <asm/intel_punit_ipc.h>
 
 /* IPC Mailbox registers */
Signature · 1 line
2.19.0
#17 lore raw

PATCH 18/28 platform/x86: intel_punit_ipc: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

---
 drivers/platform/x86/intel_punit_ipc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/platform/x86/intel_punit_ipc.c +1 -4
index 8eaa60c9ad69..79671927f4ef 100644
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the Intel P-Unit Mailbox IPC mechanism
  *
  * (C) Copyright 2015 Intel Corporation
  *
- * 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.
- *
  * The heart of the P-Unit is the Foxton microcontroller and its firmware,
  * which provide mailbox interface for power management usage.
  */
Signature · 1 line
2.19.0
#18 lore raw

PATCH 19/28 platform/x86: intel-rst: Sort headers alphabetically

In reply to Andy Shevchenko

Sort headers alphabetically for better maintenance.

No functional change.

While here, remove unneeded linux/init.h inclusion.

---
 drivers/platform/x86/intel-rst.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/platform/x86/intel-rst.c +1 -2
index 7344d841f4d9..56abf5cbb824 100644
@@ -17,10 +17,9 @@
  */
 
 
-#include <linux/init.h>
+#include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/acpi.h>
 
 MODULE_LICENSE("GPL");
 
Signature · 1 line
2.19.0
#19 lore raw

PATCH 20/28 platform/x86: intel-rst: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, throw away some extra blank lines.

---
 drivers/platform/x86/intel-rst.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)
drivers/platform/x86/intel-rst.c +1 -19
index 56abf5cbb824..3b81cb896fed 100644
@@ -1,22 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  Copyright 2013 Matthew Garrett <[email protected]>
- *
- *  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 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.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
 #include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -52,12 +38,10 @@ static ssize_t irst_store_wakeup_events(struct device *dev,
 	acpi = to_acpi_device(dev);
 
 	error = kstrtoul(buf, 0, &value);
-
 	if (error)
 		return error;
 
 	status = acpi_execute_simple_method(acpi->handle, "SFFS", value);
-
 	if (ACPI_FAILURE(status))
 		return -EINVAL;
 
@@ -98,12 +82,10 @@ static ssize_t irst_store_wakeup_time(struct device *dev,
 	acpi = to_acpi_device(dev);
 
 	error = kstrtoul(buf, 0, &value);
-
 	if (error)
 		return error;
 
 	status = acpi_execute_simple_method(acpi->handle, "SFTV", value);
-
 	if (ACPI_FAILURE(status))
 		return -EINVAL;
 
Signature · 1 line
2.19.0
#20 lore raw

PATCH 21/28 platform/x86: intel_scu_ipc: Sort headers alphabetically

In reply to Andy Shevchenko

Sort headers alphabetically for better maintenance.

No functional change.

While here, remove unneeded linux/init.h inclusion.

---
 drivers/platform/x86/intel_scu_ipc.c     |  8 +++++---
 drivers/platform/x86/intel_scu_ipcutil.c | 12 ++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)
drivers/platform/x86/intel_scu_ipc.c +5 -3
index 75c8fef7a482..3f4b24a33430 100644
@@ -16,14 +16,16 @@
  * IPC-1 Driver provides an API for power control unit registers (e.g. MSIC)
  * along with other APIs.
  */
+
 #include <linux/delay.h>
+#include <linux/device.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/device.h>
-#include <linux/pm.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/pm.h>
 #include <linux/sfi.h>
+
 #include <asm/intel-mid.h>
 #include <asm/intel_scu_ipc.h>
 
drivers/platform/x86/intel_scu_ipcutil.c +6 -6
index aa454241489c..2a65cabe87f4 100644
@@ -12,16 +12,16 @@
  * This driver provides ioctl interfaces to call intel scu ipc driver api
  */
 
-#include <linux/module.h>
-#include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/fs.h>
 #include <linux/fcntl.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/sched.h>
-#include <linux/uaccess.h>
 #include <linux/slab.h>
-#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/uaccess.h>
+
 #include <asm/intel_scu_ipc.h>
 
 static int major;
Signature · 1 line
2.19.0
#21 lore raw

PATCH 22/28 platform/x86: intel_scu_ipc: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

---
 drivers/platform/x86/intel_scu_ipc.c     |  8 ++------
 drivers/platform/x86/intel_scu_ipcutil.c | 12 ++++--------
 2 files changed, 6 insertions(+), 14 deletions(-)
drivers/platform/x86/intel_scu_ipc.c +2 -6
index 3f4b24a33430..cdab916fbf92 100644
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * intel_scu_ipc.c: Driver for the Intel SCU IPC mechanism
+ * Driver for the Intel SCU IPC mechanism
  *
  * (C) Copyright 2008-2010,2015 Intel Corporation
  * Author: Sreedhara DS ([email protected])
  *
- * 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; version 2
- * of the License.
- *
  * SCU running in ARC processor communicates with other entity running in IA
  * core through IPC mechanism which in turn messaging between IA core ad SCU.
  * SCU has two IPC mechanism IPC-1 and IPC-2. IPC-1 is used between IA32 and
drivers/platform/x86/intel_scu_ipcutil.c +4 -8
index 2a65cabe87f4..8afe6fa06d7b 100644
@@ -1,15 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * intel_scu_ipc.c: Driver for the Intel SCU IPC mechanism
+ * Driver for the Intel SCU IPC mechanism
  *
  * (C) Copyright 2008-2010 Intel Corporation
  * Author: Sreedhara DS ([email protected])
  *
- * 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; version 2
- * of the License.
- *
- * This driver provides ioctl interfaces to call intel scu ipc driver api
+ * This driver provides IOCTL interfaces to call Intel SCU IPC driver API.
  */
 
 #include <linux/errno.h>
@@ -26,7 +22,7 @@
 
 static int major;
 
-/* ioctl commnds */
+/* IOCTL commands */
 #define	INTE_SCU_IPC_REGISTER_READ	0
 #define INTE_SCU_IPC_REGISTER_WRITE	1
 #define INTE_SCU_IPC_REGISTER_UPDATE	2
Signature · 1 line
2.19.0
#22 lore raw

PATCH 23/28 platform/x86: intel-smartconnect: Sort headers alphabetically

In reply to Andy Shevchenko

Sort headers alphabetically for better maintenance.

No functional change.

While here, remove unneeded linux/init.h inclusion and move MODULE_DEVICE_TABLE() close to the table.

---
 drivers/platform/x86/intel-smartconnect.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/platform/x86/intel-smartconnect.c +2 -4
index bbe4c06c769f..274ac488afcb 100644
@@ -17,9 +17,8 @@
  */
 
 
-#include <linux/init.h>
-#include <linux/module.h>
 #include <linux/acpi.h>
+#include <linux/module.h>
 
 MODULE_LICENSE("GPL");
 
@@ -44,6 +43,7 @@ static const struct acpi_device_id smartconnect_ids[] = {
 	{"INT33A0", 0},
 	{"", 0}
 };
+MODULE_DEVICE_TABLE(acpi, smartconnect_ids);
 
 static struct acpi_driver smartconnect_driver = {
 	.owner = THIS_MODULE,
@@ -56,5 +56,3 @@ static struct acpi_driver smartconnect_driver = {
 };
 
 module_acpi_driver(smartconnect_driver);
-
-MODULE_DEVICE_TABLE(acpi, smartconnect_ids);
Signature · 1 line
2.19.0
#23 lore raw

PATCH 24/28 platform/x86: intel-smartconnect: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, throw away some extra blank lines.

---
 drivers/platform/x86/intel-smartconnect.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/platform/x86/intel-smartconnect.c +1 -15
index 274ac488afcb..64c2dc93472f 100644
@@ -1,22 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  Copyright 2013 Matthew Garrett <[email protected]>
- *
- *  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 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.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
 #include <linux/acpi.h>
 #include <linux/module.h>
 
Signature · 1 line
2.19.0
#24 lore raw

PATCH 25/28 platform/x86: intel_telemetry: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, correct MODULE_LICENSE() string to be aligned with license text.

---
 drivers/platform/x86/intel_telemetry_core.c    | 12 ++----------
 drivers/platform/x86/intel_telemetry_debugfs.c | 12 ++----------
 drivers/platform/x86/intel_telemetry_pltdrv.c  | 12 ++----------
 3 files changed, 6 insertions(+), 30 deletions(-)
drivers/platform/x86/intel_telemetry_core.c +2 -10
index f378621b5fe9..d4040bb222b4 100644
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel SoC Core Telemetry Driver
  * Copyright (C) 2015, Intel Corporation.
  * All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
  * Telemetry Framework provides platform related PM and performance statistics.
  * This file provides the core telemetry API implementation.
  */
@@ -460,4 +452,4 @@ module_exit(telemetry_module_exit);
 
 MODULE_AUTHOR("Souvik Kumar Chakravarty <[email protected]>");
 MODULE_DESCRIPTION("Intel SoC Telemetry Interface");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
drivers/platform/x86/intel_telemetry_debugfs.c +2 -10
index ffd0474b0531..badd1682f9c1 100644
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel SOC Telemetry debugfs Driver: Currently supports APL
  * Copyright (c) 2015, Intel Corporation.
  * All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
  * This file provides the debugfs interfaces for telemetry.
  * /sys/kernel/debug/telemetry/pss_info: Shows Primary Control Sub-Sys Counters
  * /sys/kernel/debug/telemetry/ioss_info: Shows IO Sub-System Counters
@@ -1037,4 +1029,4 @@ module_exit(telemetry_debugfs_exit);
 MODULE_AUTHOR("Souvik Kumar Chakravarty <[email protected]>");
 MODULE_DESCRIPTION("Intel SoC Telemetry debugfs Interface");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
drivers/platform/x86/intel_telemetry_pltdrv.c +2 -10
index 2f889d6c270e..62531d2524d8 100644
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel SOC Telemetry Platform Driver: Currently supports APL
  * Copyright (c) 2015, Intel Corporation.
  * All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
  * This file provides the platform specific telemetry implementation for APL.
  * It used the PUNIT and PMC IPC interfaces for configuring the counters.
  * The accumulated results are fetched from SRAM.
@@ -1242,4 +1234,4 @@ module_exit(telemetry_module_exit);
 MODULE_AUTHOR("Souvik Kumar Chakravarty <[email protected]>");
 MODULE_DESCRIPTION("Intel SoC Telemetry Platform Driver");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
Signature · 1 line
2.19.0
#25 lore raw

PATCH 26/28 platform/x86: intel_turbo_max_3: Sort headers alphabetically

In reply to Andy Shevchenko

Sort headers alphabetically for better maintenance.

No functional change.

---
 drivers/platform/x86/intel_turbo_max_3.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/platform/x86/intel_turbo_max_3.c +4 -3
index a6d5aa0c3c47..0e1bdb883ceb 100644
@@ -17,12 +17,13 @@
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/kernel.h>
+#include <linux/cpufeature.h>
+#include <linux/cpuhotplug.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/topology.h>
 #include <linux/workqueue.h>
-#include <linux/cpuhotplug.h>
-#include <linux/cpufeature.h>
+
 #include <asm/cpu_device_id.h>
 #include <asm/intel-family.h>
 
Signature · 1 line
2.19.0
#26 lore raw

PATCH 27/28 platform/x86: intel_turbo_max_3: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

---
 drivers/platform/x86/intel_turbo_max_3.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/platform/x86/intel_turbo_max_3.c +1 -10
index 0e1bdb883ceb..7b9cc841ab65 100644
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel Turbo Boost Max Technology 3.0 legacy (non HWP) enumeration driver
  * Copyright (c) 2017, Intel Corporation.
  * All rights reserved.
  *
  * Author: Srinivas Pandruvada <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
Signature · 1 line
2.19.0
#27 lore raw

PATCH 28/28 platform/x86: intel-wmi-thunderbolt: Convert to use SPDX identifier

In reply to Andy Shevchenko

Reduce size of duplicated comments by switching to use SPDX identifier.

No functional change.

While here, correct MODULE_LICENSE() string to be aligned with license text.

---
 drivers/platform/x86/intel-wmi-thunderbolt.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/platform/x86/intel-wmi-thunderbolt.c +2 -10
index c2257bd06f18..b029a70b084a 100644
@@ -1,16 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * WMI Thunderbolt driver
  *
  * Copyright (C) 2017 Dell Inc. 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.
- *
- *  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.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -95,4 +87,4 @@ module_wmi_driver(intel_wmi_thunderbolt_driver);
 MODULE_ALIAS("wmi:" INTEL_WMI_THUNDERBOLT_GUID);
 MODULE_AUTHOR("Mario Limonciello <[email protected]>");
 MODULE_DESCRIPTION("Intel WMI Thunderbolt force power driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
Signature · 1 line
2.19.0