From 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 6 May 2018 17:58:06 -0400 Subject: 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 --- drivers/usb/dwc3/Makefile | 4 +--- drivers/usb/dwc3/core.c | 3 +-- drivers/usb/dwc3/core.h | 3 +-- drivers/usb/dwc3/dwc3-omap.c | 3 +-- drivers/usb/dwc3/dwc3-uniphier.c | 3 +-- drivers/usb/dwc3/ep0.c | 3 +-- drivers/usb/dwc3/gadget.c | 3 +-- drivers/usb/dwc3/gadget.h | 3 +-- drivers/usb/dwc3/io.h | 3 +-- drivers/usb/dwc3/linux-compat.h | 3 +-- drivers/usb/dwc3/samsung_usb_phy.c | 3 +-- drivers/usb/dwc3/ti_usb_phy.c | 3 +-- 12 files changed, 12 insertions(+), 25 deletions(-) (limited to 'drivers/usb/dwc3') diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index 51497768b2..cd18b8d9ec 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_USB_DWC3) += dwc3.o diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 87b9c87edf..7a91015048 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * core.c - DesignWare USB3 DRD Controller Core file * @@ -10,8 +11,6 @@ * to uboot. * * commit cd72f890d2 : usb: dwc3: core: enable phy suspend quirk on non-FPGA - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 72d2fcdd3f..cbe9850a0b 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /** * core.h - DesignWare USB3 DRD Core Header * @@ -11,8 +12,6 @@ * * commit 460d098cb6 : usb: dwc3: make HIRD threshold configurable * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __DRIVERS_USB_DWC3_CORE_H diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 3dcc2f4847..64822ee739 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * dwc3-omap.c - OMAP Specific Glue layer * @@ -10,8 +11,6 @@ * to uboot. * * commit 7ee2566ff5 : usb: dwc3: dwc3-omap: get rid of ->prepare()/->complete() - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/drivers/usb/dwc3/dwc3-uniphier.c b/drivers/usb/dwc3/dwc3-uniphier.c index 25b17a85d0..6e9c52189d 100644 --- a/drivers/usb/dwc3/dwc3-uniphier.c +++ b/drivers/usb/dwc3/dwc3-uniphier.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * UniPhier Specific Glue Layer for DWC3 * * Copyright (C) 2016-2017 Socionext Inc. * Author: Masahiro Yamada - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index e61d98046f..4f68887b8d 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * ep0.c - DesignWare USB3 DRD Controller Endpoint 0 Handling * @@ -10,8 +11,6 @@ * to uboot. * * commit c00552ebaf : Merge 3.18-rc7 into usb-next - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index e065c5aeb3..d45fae044c 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * gadget.c - DesignWare USB3 DRD Controller Gadget Framework Link * @@ -10,8 +11,6 @@ * to uboot. * * commit 8e74475b0e : usb: dwc3: gadget: use udc-core's reset notifier - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h index c7db219599..7806ce59a2 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /** * gadget.h - DesignWare USB3 DRD Gadget Header * @@ -12,8 +13,6 @@ * commit 7a60855972 : usb: dwc3: gadget: fix set_halt() bug with pending transfers * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __DRIVERS_USB_DWC3_GADGET_H diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h index 810980f613..f660d53231 100644 --- a/drivers/usb/dwc3/io.h +++ b/drivers/usb/dwc3/io.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /** * io.h - DesignWare USB3 DRD IO Header * @@ -11,8 +12,6 @@ * * commit 2c4cbe6e5a : usb: dwc3: add tracepoints to aid debugging * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __DRIVERS_USB_DWC3_IO_H diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h index 5cbe377e3c..27ae21247b 100644 --- a/drivers/usb/dwc3/linux-compat.h +++ b/drivers/usb/dwc3/linux-compat.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /** * linux-compat.h - DesignWare USB3 Linux Compatibiltiy Adapter Header * @@ -5,8 +6,6 @@ * * Authors: Kishon Vijay Abraham I * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __DWC3_LINUX_COMPAT__ diff --git a/drivers/usb/dwc3/samsung_usb_phy.c b/drivers/usb/dwc3/samsung_usb_phy.c index 4220986548..677061458c 100644 --- a/drivers/usb/dwc3/samsung_usb_phy.c +++ b/drivers/usb/dwc3/samsung_usb_phy.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /** * samsung_usb_phy.c - DesignWare USB3 (DWC3) PHY handling file * * Copyright (C) 2015 Samsung Electronics * * Author: Joonyoung Shim - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c index 218a8e586c..925f56c97c 100644 --- a/drivers/usb/dwc3/ti_usb_phy.c +++ b/drivers/usb/dwc3/ti_usb_phy.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /** * ti_usb_phy.c - USB3 and USB3 PHY programming for dwc3 * @@ -13,8 +14,6 @@ * * "commit eb82a3 : phy: omap-usb2: Balance pm_runtime_enable() on probe failure * and remove" for phy-omap-usb2.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit