diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-06 17:58:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 09:34:12 -0400 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /include/linux | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and
there weren't a lot of other examples to borrow from. So we picked the
area of the file that usually had a full license text and replaced it
with an appropriate SPDX-License-Identifier: entry. Since then, the
Linux Kernel has adopted SPDX tags and they place it as the very first
line in a file (except where shebangs are used, then it's second line)
and with slightly different comment styles than us.
In part due to community overlap, in part due to better tag visibility
and in part for other minor reasons, switch over to that style.
This commit changes all instances where we have a single declared
license in the tag as both the before and after are identical in tag
contents. There's also a few places where I found we did not have a tag
and have introduced one.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/linux')
39 files changed, 39 insertions, 80 deletions
diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h index d18ca719fc..3dabc3f770 100644 --- a/include/linux/apm_bios.h +++ b/include/linux/apm_bios.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _LINUX_APM_H #define _LINUX_APM_H /* * Include file for the interface to an APM BIOS * Copyright 1994-2001 Stephen Rothwell (sfr@canb.auug.org.au) - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <linux/types.h> diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index 28e61ce83b..2d1e6cc156 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015, Linaro Limited - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __LINUX_ARM_SMCCC_H #define __LINUX_ARM_SMCCC_H diff --git a/include/linux/bch.h b/include/linux/bch.h index 28da402f46..1305d2ca19 100644 --- a/include/linux/bch.h +++ b/include/linux/bch.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Generic binary BCH encoding/decoding library * - * SPDX-License-Identifier: GPL-2.0 - * * Copyright © 2011 Parrot S.A. * * Author: Ivan Djelic <ivan.djelic@parrot.com> diff --git a/include/linux/bitrev.h b/include/linux/bitrev.h index 6876e1b2ec..cc5abd7396 100644 --- a/include/linux/bitrev.h +++ b/include/linux/bitrev.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* - * SPDX-License-Identifier: GPL-2.0+ - * * Based on bitrev from the Linux kernel, by Akinobu Mita */ diff --git a/include/linux/crc8.h b/include/linux/crc8.h index f7c300a9b1..0ab5b9ab21 100644 --- a/include/linux/crc8.h +++ b/include/linux/crc8.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/include/linux/delay.h b/include/linux/delay.h index 3dcd435d0d..193603451a 100644 --- a/include/linux/delay.h +++ b/include/linux/delay.h @@ -1,6 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _LINUX_DELAY_H #define _LINUX_DELAY_H diff --git a/include/linux/edd.h b/include/linux/edd.h index a83742fc7a..992ce7cf9f 100644 --- a/include/linux/edd.h +++ b/include/linux/edd.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/include/linux/edd.h * Copyright (C) 2002, 2003, 2004 Dell Inc. @@ -16,8 +17,6 @@ * transferred into the edd structure, and in drivers/firmware/edd.c, that * information is used to identify BIOS boot disk. The code in setup.S * is very sensitive to the size of these structures. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_EDD_H #define _LINUX_EDD_H diff --git a/include/linux/immap_qe.h b/include/linux/immap_qe.h index d952efa8f4..51800096b2 100644 --- a/include/linux/immap_qe.h +++ b/include/linux/immap_qe.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * QUICC Engine (QE) Internal Memory Map. * The Internal Memory Map for devices with QE on them. This @@ -5,8 +6,6 @@ * * Copyright (c) 2006-2009, 2011 Freescale Semiconductor, Inc. * Author: Shlomi Gridih <gridish@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IMMAP_QE_H__ diff --git a/include/linux/input.h b/include/linux/input.h index 3662c9f0a7..c7ee22acab 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 1999-2002 Vojtech Pavlik - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_INPUT_H diff --git a/include/linux/io.h b/include/linux/io.h index bf1ddbbaa6..d1b3efed9d 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -1,6 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _LINUX_IO_H #define _LINUX_IO_H diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index 31c55ae076..ab0ae1969a 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_IOPOLL_H diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 8e2f15a635..0b24111d6a 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * U-Boot - linkage.h * * Copyright (c) 2005-2007 Analog Devices Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _LINUX_LINKAGE_H diff --git a/include/linux/log2.h b/include/linux/log2.h index aa1de63090..4ded5ee68a 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* Integer base 2 logarithm calculation * * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. * Written by David Howells (dhowells@redhat.com) - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _LINUX_LOG2_H diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h index be81d3824a..7239eb1125 100644 --- a/include/linux/mtd/bbm.h +++ b/include/linux/mtd/bbm.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * linux/include/linux/mtd/bbm.h * @@ -10,8 +11,6 @@ * Copyright © 2000-2005 * Thomas Gleixner <tglx@linuxtronix.de> * - * SPDX-License-Identifier: GPL-2.0+ - * */ #ifndef __LINUX_MTD_BBM_H #define __LINUX_MTD_BBM_H diff --git a/include/linux/mtd/concat.h b/include/linux/mtd/concat.h index a374ca98e8..c57e973775 100644 --- a/include/linux/mtd/concat.h +++ b/include/linux/mtd/concat.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * MTD device concatenation layer definitions * * Copyright © 2002 Robert Kaiser <rkaiser@sysgo.de> * - * SPDX-License-Identifier: GPL-2.0+ - * */ #ifndef MTD_CONCAT_H diff --git a/include/linux/mtd/doc2000.h b/include/linux/mtd/doc2000.h index a3cfe6bdd9..d57f8da810 100644 --- a/include/linux/mtd/doc2000.h +++ b/include/linux/mtd/doc2000.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Linux driver for Disk-On-Chip devices * @@ -6,8 +7,6 @@ * Copyright © 2002-2003 Greg Ungerer <gerg@snapgear.com> * Copyright © 2002-2003 SnapGear Inc * - * SPDX-License-Identifier: GPL-2.0+ - * */ #ifndef __MTD_DOC2000_H__ diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h index e5c7d1cf0d..666480db93 100644 --- a/include/linux/mtd/flashchip.h +++ b/include/linux/mtd/flashchip.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright © 2000 Red Hat UK Limited * Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org> * - * SPDX-License-Identifier: GPL-2.0+ - * */ #ifndef __MTD_FLASHCHIP_H__ diff --git a/include/linux/mtd/fsl_upm.h b/include/linux/mtd/fsl_upm.h index a023860e7b..9999993543 100644 --- a/include/linux/mtd/fsl_upm.h +++ b/include/linux/mtd/fsl_upm.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * FSL UPM NAND driver * * Copyright (C) 2007 MontaVista Software, Inc. * Anton Vorontsov <avorontsov@ru.mvista.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_MTD_NAND_FSL_UPM diff --git a/include/linux/mtd/fsmc_nand.h b/include/linux/mtd/fsmc_nand.h index bc3db030d0..6079f9e260 100644 --- a/include/linux/mtd/fsmc_nand.h +++ b/include/linux/mtd/fsmc_nand.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2010 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __FSMC_NAND_H__ diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index ba4cbba949..0c41140465 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org> et al. * - * SPDX-License-Identifier: GPL-2.0+ - * */ #ifndef __MTD_MTD_H__ diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h index 02ba9f7e63..397836384c 100644 --- a/include/linux/mtd/nand_ecc.h +++ b/include/linux/mtd/nand_ecc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * drivers/mtd/nand_ecc.h * @@ -5,8 +6,6 @@ * David Woodhouse <dwmw2@infradead.org> * Thomas Gleixner <tglx@linutronix.de> * - * SPDX-License-Identifier: GPL-2.0 - * * This file is the header for the ECC algorithm. */ diff --git a/include/linux/mtd/omap_elm.h b/include/linux/mtd/omap_elm.h index b8096b02e3..f3db00d55d 100644 --- a/include/linux/mtd/omap_elm.h +++ b/include/linux/mtd/omap_elm.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2010-2011 Texas Instruments, <www.ti.com> * Mansoor Ahamed <mansoor.ahamed@ti.com> * * Derived from work done by Rohit Choraria <rohitkc@ti.com> for omap3 - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARCH_ELM_H #define __ASM_ARCH_ELM_H diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h index be3ce9d203..864b05e432 100644 --- a/include/linux/mtd/omap_gpmc.h +++ b/include/linux/mtd/omap_gpmc.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2004-2008 Texas Instruments, <www.ti.com> * Rohit Choraria <rohitkc@ti.com> * * (C) Copyright 2013 Andreas Bießmann <andreas@biessmann.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_OMAP_GPMC_H #define __ASM_OMAP_GPMC_H diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 6c3e838d80..7fe553fc51 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org> * Steven J. Hill <sjhill@realitydiluted.com> * Thomas Gleixner <tglx@linutronix.de> * - * SPDX-License-Identifier: GPL-2.0+ - * * Info: * Contains standard defines and IDs for NAND flash devices * diff --git a/include/linux/mtd/samsung_onenand.h b/include/linux/mtd/samsung_onenand.h index 246bcf8f3c..7774fecdf8 100644 --- a/include/linux/mtd/samsung_onenand.h +++ b/include/linux/mtd/samsung_onenand.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2005-2009 Samsung Electronics * Minkyu Kang <mk7.kang@samsung.com> * Kyungmin Park <kyungmin.park@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __SAMSUNG_ONENAND_H__ diff --git a/include/linux/mtd/st_smi.h b/include/linux/mtd/st_smi.h index 645c6a31eb..6058969787 100644 --- a/include/linux/mtd/st_smi.h +++ b/include/linux/mtd/st_smi.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef ST_SMI_H diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h index 036779b347..badf6a0c6c 100644 --- a/include/linux/mtd/ubi.h +++ b/include/linux/mtd/ubi.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) International Business Machines Corp., 2006 * - * SPDX-License-Identifier: GPL-2.0+ - * * Author: Artem Bityutskiy (Битюцкий Артём) */ diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 12e8cc19be..40dad25e40 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * INET An implementation of the TCP/IP protocol suite for the LINUX * operating system. INET is implemented using the BSD Socket @@ -15,8 +16,6 @@ * Bjorn Ekwall. <bj0rn@blox.se> * Pekka Riikonen <priikone@poseidon.pspt.fi> * - * SPDX-License-Identifier: GPL-2.0+ - * * Moved to /usr/include/linux for NET3 */ #ifndef _LINUX_NETDEVICE_H diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h index 2cc16a3e7d..1d2b1768c1 100644 --- a/include/linux/rbtree.h +++ b/include/linux/rbtree.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* Red Black Trees (C) 1999 Andrea Arcangeli <andrea@suse.de> - * SPDX-License-Identifier: GPL-2.0+ - linux/include/linux/rbtree.h To use rbtrees you'll have to implement your own insert and search cores. diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h index a86797edb6..da04156e8a 100644 --- a/include/linux/rbtree_augmented.h +++ b/include/linux/rbtree_augmented.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* Red Black Trees (C) 1999 Andrea Arcangeli <andrea@suse.de> (C) 2002 David Woodhouse <dwmw2@infradead.org> (C) 2012 Michel Lespinasse <walken@google.com> - * SPDX-License-Identifier: GPL-2.0+ - linux/include/linux/rbtree_augmented.h */ diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 9214b67b11..29c3b5b9a5 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * include/linux/serial_reg.h * * Copyright (C) 1992, 1994 by Theodore Ts'o. - * - * SPDX-License-Identifier: GPL-2.0+ * * These are the UART port assignments, expressed as offsets from the base * register. These assignments should hold for any serial port based on diff --git a/include/linux/usb/at91_udc.h b/include/linux/usb/at91_udc.h index cd0d00f5a5..541e2ba62c 100644 --- a/include/linux/usb/at91_udc.h +++ b/include/linux/usb/at91_udc.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Platform data definitions for Atmel USBA gadget driver * pieces copied from linux:include/linux/platform_data/atmel.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_AT91_UDC_H__ #define __LINUX_USB_AT91_UDC_H__ diff --git a/include/linux/usb/atmel_usba_udc.h b/include/linux/usb/atmel_usba_udc.h index be29ef0c5c..c1c810759c 100644 --- a/include/linux/usb/atmel_usba_udc.h +++ b/include/linux/usb/atmel_usba_udc.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Platform data definitions for Atmel USBA gadget driver * [Original from Linux kernel: include/linux/usb/atmel_usba_udc.h] - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_USBA_H__ #define __LINUX_USB_USBA_H__ diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 86e1ceac3c..30c464ce39 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * composite.h -- framework for usb gadgets which are composite devices * * Copyright (C) 2006-2008 David Brownell - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_COMPOSITE_H diff --git a/include/linux/usb/dwc3-omap.h b/include/linux/usb/dwc3-omap.h index 8bf7b55d87..62180e3973 100644 --- a/include/linux/usb/dwc3-omap.h +++ b/include/linux/usb/dwc3-omap.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* include/linux/usb/dwc3-omap.h * * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com * * Designware SuperSpeed Glue - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DWC3_OMAP_H_ diff --git a/include/linux/usb/dwc3.h b/include/linux/usb/dwc3.h index c1b23b2f1b..9ceee0a1c9 100644 --- a/include/linux/usb/dwc3.h +++ b/include/linux/usb/dwc3.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* include/linux/usb/dwc3.h * * Copyright (c) 2012 Samsung Electronics Co. Ltd * * Designware SuperSpeed USB 3.0 DRD Controller global and OTG registers - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DWC3_H_ diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 8f8ac6aeef..0b273d8e2e 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* include/linux/usb/otg.h * * Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com * * USB OTG (On The Go) defines - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_OTG_H diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index a916afb885..1367149c4b 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2015 Freescale Semiconductor, Inc. * * FSL USB HOST xHCI Controller * * Author: Ramneek Mehresh<ramneek.mehresh@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARCH_XHCI_FSL_H_ diff --git a/include/linux/usb/xhci-omap.h b/include/linux/usb/xhci-omap.h index f038ddb669..ce9c074b23 100644 --- a/include/linux/usb/xhci-omap.h +++ b/include/linux/usb/xhci-omap.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2013 * Texas Instruments Inc, <www.ti.com> * * Author: Dan Murphy <dmurphy@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARCH_XHCI_OMAP_H_ |