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 /drivers/usb/gadget | |
| 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 'drivers/usb/gadget')
39 files changed, 39 insertions, 82 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 748366fb9f0..b74c1fdce97 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_USB_GADGET) += epautoconf.o config.o usbstring.o obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o usbstring.o diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index ad2f606b78b..39ea87005cb 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * from linux: * c94e289f195e: usb: gadget: remove incorrect __init/__exit annotations @@ -7,8 +8,6 @@ * Copyright (C) 2004 by Thomas Rathbone * Copyright (C) 2005 by HP Labs * Copyright (C) 2005 by David Brownell - * - * SPDX-License-Identifier: GPL-2.0+ */ #undef VERBOSE_DEBUG diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h index 240bc14a0b6..668b8c4a7c6 100644 --- a/drivers/usb/gadget/at91_udc.h +++ b/drivers/usb/gadget/at91_udc.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2004 by Thomas Rathbone, HP Labs * Copyright (C) 2005 by Ivan Kokshaysky * Copyright (C) 2006 by SAN People - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef AT91_UDC_H diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index c0a95a97c9f..c9d483318fe 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Driver for the Atmel USBA high speed USB device controller * [Original from Linux kernel: drivers/usb/gadget/atmel_usba_udc.c] * * Copyright (C) 2005-2013 Atmel Corporation * Bo Shen <voice.shen@atmel.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h index c6d12d3a8ef..f6cb48c1cff 100644 --- a/drivers/usb/gadget/atmel_usba_udc.h +++ b/drivers/usb/gadget/atmel_usba_udc.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Register definition for Atmel USBA high speed USB device controller * [Original from Linux kernel: drivers/usb/gadget/atmel_usba_udc.h] * * Copyright (C) 2005-2013 Atmel Corporation * Bo Shen <voice.shen@atmel.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_GADGET_USBA_UDC_H__ diff --git a/drivers/usb/gadget/bcm_udc_otg.h b/drivers/usb/gadget/bcm_udc_otg.h index d47aefaa89c..24cc936c6b4 100644 --- a/drivers/usb/gadget/bcm_udc_otg.h +++ b/drivers/usb/gadget/bcm_udc_otg.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2015 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __BCM_UDC_OTG_H diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c index 877f1626303..3ecb669507b 100644 --- a/drivers/usb/gadget/bcm_udc_otg_phy.c +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 05c01ce5d6e..2b9dbf06b99 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2011, Marvell Semiconductor Inc. * Lei Wen <leiwen@marvell.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * Back ported to the 8xx platform (from the 8260 platform) by * Murray.Jensen@cmst.csiro.au, 27-Jan-01. */ diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 6e4426ccedc..e307c738fd7 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * composite.c - infrastructure for Composite USB Gadgets * * Copyright (C) 2006-2008 David Brownell * U-Boot porting: Lukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #undef DEBUG diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c index 525dc79d273..e96782644f3 100644 --- a/drivers/usb/gadget/config.c +++ b/drivers/usb/gadget/config.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * usb/gadget/config.c -- simplify building config descriptors * * Copyright (C) 2003 David Brownell * - * SPDX-License-Identifier: GPL-2.0+ - * * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c index 30d55a49ac9..ffaf161fb7e 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2003 * Gerry Hamel, geh@ti.com, Texas Instruments @@ -12,8 +13,6 @@ * Stuart Lynne <sl@lineo.com>, * Tom Rushworth <tbr@lineo.com>, * Bruce Balden <balden@lineo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <malloc.h> diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c index a25f5019e8a..fa947dade68 100644 --- a/drivers/usb/gadget/designware_udc.c +++ b/drivers/usb/gadget/designware_udc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Based on drivers/usb/gadget/omap1510_udc.c * TI OMAP1510 USB bus interface driver * * (C) Copyright 2009 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 088811c1913..e3edd10e29c 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/usb/gadget/dwc2_udc_otg.c * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers @@ -14,8 +15,6 @@ * Ported to u-boot: * Marek Szyprowski <m.szyprowski@samsung.com> * Lukasz Majewski <l.majewski@samsumg.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #undef DEBUG #include <common.h> diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c index 0c4620d56d7..47aa78ae947 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_phy.c +++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/usb/gadget/dwc2_udc_otg.c * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers @@ -14,8 +15,6 @@ * Ported to u-boot: * Marek Szyprowski <m.szyprowski@samsung.com> * Lukasz Majewski <l.majewski@samsumg.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h index c40ecf8acaf..b64e222b6d7 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_priv.h +++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Designware DWC2 on-chip full/high speed USB device controllers * Copyright (C) 2005 for Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DWC2_UDC_OTG_PRIV__ diff --git a/drivers/usb/gadget/dwc2_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h index c94396afc02..a1829b3fd12 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_regs.h +++ b/drivers/usb/gadget/dwc2_udc_otg_regs.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* linux/arch/arm/plat-s3c/include/plat/regs-otg.h * * Copyright (C) 2004 Herbert Poetzl <herbert@13thfloor.at> * * Registers remapping: * Lukasz Majewski <l.majewski@samsumg.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARCH_REGS_USB_OTG_HS_H diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c index 57dbbd5ebfa..a75af4987f8 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers @@ -14,8 +15,6 @@ * Ported to u-boot: * Marek Szyprowski <m.szyprowski@samsung.com> * Lukasz Majewski <l.majewski@samsumg.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ static u8 clear_feature_num; diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index 4ba2f3d99fd..a36d9ec03d8 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2003 * Gerry Hamel, geh@ti.com, Texas Instruments @@ -15,8 +16,6 @@ * Stuart Lynne <sl@lineo.com>, * Tom Rushworth <tbr@lineo.com>, * Bruce Balden <balden@lineo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/usb/gadget/ep0.h b/drivers/usb/gadget/ep0.h index 6042e756206..976825ab93e 100644 --- a/drivers/usb/gadget/ep0.h +++ b/drivers/usb/gadget/ep0.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2003 * Gerry Hamel, geh@ti.com, Texas Instruments @@ -12,8 +13,6 @@ * Stuart Lynne <sl@lineo.com>, * Tom Rushworth <tbr@lineo.com>, * Bruce Balden <balden@lineo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __USBDCORE_EP0_H__ diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index 6d6dbcb09c0..179b94cdd0a 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * epautoconf.c -- endpoint autoconfiguration for usb gadget drivers * * Copyright (C) 2004 David Brownell * - * SPDX-License-Identifier: GPL-2.0+ - * - * SPDX-License-Identifier: GPL-2.0+ - * * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 386505d42de..8ab9b9fe56a 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * ether.c -- Ethernet gadget driver, with CDC and non-CDC options * * Copyright (C) 2003-2005,2008 David Brownell * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger * Copyright (C) 2008 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index bc4be712da7..30ece524a8e 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * f_dfu.c -- Device Firmware Update USB function * @@ -11,8 +12,6 @@ * * based on existing SAM7DFU code from OpenPCD: * (C) Copyright 2006 by Harald Welte <hwelte at hmw-consulting.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> diff --git a/drivers/usb/gadget/f_dfu.h b/drivers/usb/gadget/f_dfu.h index a2565774e1c..a175e3f134b 100644 --- a/drivers/usb/gadget/f_dfu.h +++ b/drivers/usb/gadget/f_dfu.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * f_dfu.h -- Device Firmware Update gadget * * Copyright (C) 2011-2012 Samsung Electronics * author: Andrzej Pietrasiewicz <andrzej.p@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __F_DFU_H_ diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 7acffb6c87e..3acadae8b17 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 - 2009 * Windriver, <www.windriver.com> @@ -7,8 +8,6 @@ * * Copyright 2014 Linaro, Ltd. * Rob Herring <robh@kernel.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <common.h> diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c index ad3ae91e6de..b8833d0b543 100644 --- a/drivers/usb/gadget/f_rockusb.c +++ b/drivers/usb/gadget/f_rockusb.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2017 * * Eddie Cai <eddie.cai.linux@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <common.h> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index 43c5cfbb77a..00a9f88a418 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * f_sdp.c -- USB HID Serial Download Protocol * @@ -13,8 +14,6 @@ * SKIP_DCD_HEADER are only stubs. * * Parts of the implementation are based on f_dfu and f_thor. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 18f233ab587..f874509cf38 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * f_thor.c -- USB TIZEN THOR Downloader gadget function * @@ -11,8 +12,6 @@ * Copyright (C) 2009 Samsung Electronics * Minkyu Kang <mk7.kang@samsung.com> * Sanghee Kim <sh0130.kim@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h index 83412851dd1..47abc8aebd5 100644 --- a/drivers/usb/gadget/f_thor.h +++ b/drivers/usb/gadget/f_thor.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * f_thor.h - USB TIZEN THOR - internal gadget definitions * * Copyright (C) 2013 Samsung Electronics * Lukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _USB_THOR_H_ diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c index e061b2e8a65..176068cbfb8 100644 --- a/drivers/usb/gadget/fotg210.c +++ b/drivers/usb/gadget/fotg210.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Faraday USB 2.0 OTG Controller * * (C) Copyright 2010 Faraday Technology * Dante Su <dantesu@faraday-tech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 99d500a6af4..e9e1600a1a5 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * g_dnl.c -- USB Downloader Gadget * * Copyright (C) 2012 Samsung Electronics * Lukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 6a8949da34a..44092df25ba 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Intel PXA25x and IXP4xx on-chip full speed USB device controllers * @@ -8,8 +9,6 @@ * Copyright (C) 2003 Joshua Wise * Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell"); */ diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/pxa25x_udc.h index f543b2d588e..7c3882aa1e0 100644 --- a/drivers/usb/gadget/pxa25x_udc.h +++ b/drivers/usb/gadget/pxa25x_udc.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Intel PXA25x on-chip full speed USB device controller * * Copyright (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix * Copyright (C) 2003 David Brownell * Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_GADGET_PXA25X_H diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index c7b21aee421..15c43782b80 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PXA27x USB device driver for u-boot. * * Copyright (C) 2007 Rodolfo Giometti <giometti@linux.it> * Copyright (C) 2007 Eurotech S.p.A. <info@eurotech.it> * Copyright (C) 2008 Vivek Kutal <vivek.kutal@azingo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index 5ad481302b4..d47e29e447d 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * RNDIS MSG parser * @@ -15,8 +16,6 @@ * * Copyright (C) 2004 by David Brownell * updates to merge with Linux 2.6, better match RNDIS spec - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/gadget/rndis.h b/drivers/usb/gadget/rndis.h index 084af8541ce..e827af0be4a 100644 --- a/drivers/usb/gadget/rndis.h +++ b/drivers/usb/gadget/rndis.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * RNDIS Definitions for Remote NDIS * @@ -6,8 +7,6 @@ * * This software was originally developed in conformance with * Microsoft's Remote NDIS Specification License Agreement. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _USBGADGET_RNDIS_H diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index 4d5a9a8c423..ce046e75a97 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * storage_common.c -- Common definitions for mass storage functionality * @@ -10,8 +11,6 @@ * * Code refactoring & cleanup: * Łukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/usb/gadget/udc/Makefile b/drivers/usb/gadget/udc/Makefile index 1699ccdf94c..449339f2c44 100644 --- a/drivers/usb/gadget/udc/Makefile +++ b/drivers/usb/gadget/udc/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # USB peripheral controller drivers -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_USB_DWC3_GADGET) += udc-core.o diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index 326757b547f..f5c30dd7507 100644 --- a/drivers/usb/gadget/udc/udc-core.c +++ b/drivers/usb/gadget/udc/udc-core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * udc-core.c - Core UDC Framework * @@ -10,8 +11,6 @@ * * commit 02e8c96627 : usb: gadget: udc: core: prepend udc_attach_driver with * usb_ - * - * SPDX-License-Identifier: GPL-2.0 */ #include <linux/compat.h> diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c index 67e98c065d3..83cdd8a2595 100644 --- a/drivers/usb/gadget/usbstring.c +++ b/drivers/usb/gadget/usbstring.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2003 David Brownell * - * SPDX-License-Identifier: LGPL-2.1+ - * * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ |