Patchwork USB: add SPDX identifiers to all files in drivers/usb/

login
register
mail settings
Submitter gregkh@linuxfoundation.org
Date Oct. 19, 2017, 8:38 a.m.
Message ID <20171019083832.GA21820@kroah.com>
Download mbox | patch
Permalink /patch/10016189/
State New
Headers show

Comments

gregkh@linuxfoundation.org - Oct. 19, 2017, 8:38 a.m.
It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.  This patch adds these
identifiers to all files in drivers/usb/ based on a script and data from
Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
Unless someone really complains, I'm going to add this to my tree for
4.15-rc1.
Geert Uytterhoeven - Oct. 19, 2017, 8:49 a.m.
Hi Greg,

On Thu, Oct 19, 2017 at 10:38 AM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.  This patch adds these
> identifiers to all files in drivers/usb/ based on a script and data from
> Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Kate Stewart <kstewart@linuxfoundation.org>
> Cc: Philippe Ombredanne <pombredanne@nexb.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> Unless someone really complains, I'm going to add this to my tree for
> 4.15-rc1.

It would be good to include a diffstat, esp. when touching +600 files.

> diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
> index 9650b351c26c..cb8d902b801d 100644

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Thomas Gleixner - Oct. 19, 2017, 8:50 a.m.
On Thu, 19 Oct 2017, Greg Kroah-Hartman wrote:

> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.  This patch adds these
> identifiers to all files in drivers/usb/ based on a script and data from
> Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
> 
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Kate Stewart <kstewart@linuxfoundation.org>
> Cc: Philippe Ombredanne <pombredanne@nexb.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> Unless someone really complains, I'm going to add this to my tree for
> 4.15-rc1.
> 
> 
> diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
> index 9650b351c26c..cb8d902b801d 100644
> --- a/drivers/usb/Makefile
> +++ b/drivers/usb/Makefile
> @@ -1,6 +1,7 @@
>  #
>  # Makefile for the kernel USB device drivers.
>  #
> +# SPDX-License-Identifier: GPL-2.0

The last discussion about this was to add the identifier as the first line
of the file or as the second in case of files with a shebang in the first
one.

I think you missed the last version of the script. Attached.

Thanks,

	tglx
gregkh@linuxfoundation.org - Oct. 19, 2017, 8:52 a.m.
On Thu, Oct 19, 2017 at 10:49:47AM +0200, Geert Uytterhoeven wrote:
> Hi Greg,
> 
> On Thu, Oct 19, 2017 at 10:38 AM, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> > It's good to have SPDX identifiers in all files to make it easier to
> > audit the kernel tree for correct licenses.  This patch adds these
> > identifiers to all files in drivers/usb/ based on a script and data from
> > Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
> >
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Kate Stewart <kstewart@linuxfoundation.org>
> > Cc: Philippe Ombredanne <pombredanne@nexb.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> > Unless someone really complains, I'm going to add this to my tree for
> > 4.15-rc1.
> 
> It would be good to include a diffstat, esp. when touching +600 files.

I wanted to, but I was worried it would be too long to prevent the patch
from hitting the list :)

Here it is:

 drivers/usb/Makefile                           |    1 +
 drivers/usb/atm/Makefile                       |    1 +
 drivers/usb/atm/cxacru.c                       |    1 +
 drivers/usb/atm/speedtch.c                     |    1 +
 drivers/usb/atm/ueagle-atm.c                   |    2 ++
 drivers/usb/atm/usbatm.c                       |    1 +
 drivers/usb/atm/usbatm.h                       |    1 +
 drivers/usb/atm/xusbatm.c                      |    1 +
 drivers/usb/c67x00/c67x00-drv.c                |    2 ++
 drivers/usb/c67x00/c67x00-hcd.c                |    2 ++
 drivers/usb/c67x00/c67x00-hcd.h                |    2 ++
 drivers/usb/c67x00/c67x00-ll-hpi.c             |    2 ++
 drivers/usb/c67x00/c67x00-sched.c              |    2 ++
 drivers/usb/c67x00/c67x00.h                    |    2 ++
 drivers/usb/chipidea/Makefile                  |    1 +
 drivers/usb/chipidea/bits.h                    |    2 ++
 drivers/usb/chipidea/ci.h                      |    2 ++
 drivers/usb/chipidea/ci_hdrc_imx.c             |    2 ++
 drivers/usb/chipidea/ci_hdrc_imx.h             |    2 ++
 drivers/usb/chipidea/ci_hdrc_msm.c             |    2 ++
 drivers/usb/chipidea/ci_hdrc_pci.c             |    2 ++
 drivers/usb/chipidea/ci_hdrc_usb2.c            |    2 ++
 drivers/usb/chipidea/ci_hdrc_zevio.c           |    2 ++
 drivers/usb/chipidea/core.c                    |    2 ++
 drivers/usb/chipidea/debug.c                   |    1 +
 drivers/usb/chipidea/host.c                    |    2 ++
 drivers/usb/chipidea/host.h                    |    1 +
 drivers/usb/chipidea/otg.c                     |    2 ++
 drivers/usb/chipidea/otg.h                     |    2 ++
 drivers/usb/chipidea/otg_fsm.c                 |    2 ++
 drivers/usb/chipidea/otg_fsm.h                 |    2 ++
 drivers/usb/chipidea/udc.c                     |    2 ++
 drivers/usb/chipidea/udc.h                     |    2 ++
 drivers/usb/chipidea/ulpi.c                    |    2 ++
 drivers/usb/chipidea/usbmisc_imx.c             |    2 ++
 drivers/usb/class/cdc-acm.c                    |    2 ++
 drivers/usb/class/cdc-acm.h                    |    2 ++
 drivers/usb/class/cdc-wdm.c                    |    2 ++
 drivers/usb/class/usblp.c                      |    2 ++
 drivers/usb/class/usbtmc.c                     |    2 ++
 drivers/usb/common/Makefile                    |    1 +
 drivers/usb/common/common.c                    |    2 ++
 drivers/usb/common/led.c                       |    2 ++
 drivers/usb/common/ulpi.c                      |    2 ++
 drivers/usb/common/usb-otg-fsm.c               |    2 ++
 drivers/usb/core/Makefile                      |    1 +
 drivers/usb/core/devices.c                     |    2 ++
 drivers/usb/core/devio.c                       |    6 +++++-
 drivers/usb/core/hcd-pci.c                     |    2 ++
 drivers/usb/core/hcd.c                         |    2 ++
 drivers/usb/core/hub.h                         |    2 ++
 drivers/usb/core/ledtrig-usbport.c             |    2 ++
 drivers/usb/core/of.c                          |    2 ++
 drivers/usb/core/otg_whitelist.h               |    2 ++
 drivers/usb/core/port.c                        |    2 ++
 drivers/usb/core/quirks.c                      |    2 ++
 drivers/usb/core/usb-acpi.c                    |    2 ++
 drivers/usb/dwc2/Makefile                      |    1 +
 drivers/usb/dwc2/core.c                        |    2 ++
 drivers/usb/dwc2/core.h                        |    2 ++
 drivers/usb/dwc2/core_intr.c                   |    2 ++
 drivers/usb/dwc2/debug.h                       |    2 ++
 drivers/usb/dwc2/debugfs.c                     |    2 ++
 drivers/usb/dwc2/gadget.c                      |    2 ++
 drivers/usb/dwc2/hcd.c                         |    2 ++
 drivers/usb/dwc2/hcd.h                         |    2 ++
 drivers/usb/dwc2/hcd_ddma.c                    |    2 ++
 drivers/usb/dwc2/hcd_intr.c                    |    2 ++
 drivers/usb/dwc2/hcd_queue.c                   |    2 ++
 drivers/usb/dwc2/hw.h                          |    2 ++
 drivers/usb/dwc2/params.c                      |    2 ++
 drivers/usb/dwc2/pci.c                         |    2 ++
 drivers/usb/dwc2/platform.c                    |    2 ++
 drivers/usb/dwc3/Makefile                      |    1 +
 drivers/usb/dwc3/core.c                        |    2 ++
 drivers/usb/dwc3/core.h                        |    2 ++
 drivers/usb/dwc3/debug.h                       |    2 ++
 drivers/usb/dwc3/debugfs.c                     |    2 ++
 drivers/usb/dwc3/drd.c                         |    2 ++
 drivers/usb/dwc3/dwc3-exynos.c                 |    2 ++
 drivers/usb/dwc3/dwc3-keystone.c               |    2 ++
 drivers/usb/dwc3/dwc3-of-simple.c              |    2 ++
 drivers/usb/dwc3/dwc3-omap.c                   |    2 ++
 drivers/usb/dwc3/dwc3-pci.c                    |    2 ++
 drivers/usb/dwc3/dwc3-st.c                     |    2 ++
 drivers/usb/dwc3/ep0.c                         |    2 ++
 drivers/usb/dwc3/gadget.c                      |    2 ++
 drivers/usb/dwc3/gadget.h                      |    2 ++
 drivers/usb/dwc3/host.c                        |    2 ++
 drivers/usb/dwc3/io.h                          |    2 ++
 drivers/usb/dwc3/trace.c                       |    2 ++
 drivers/usb/dwc3/trace.h                       |    2 ++
 drivers/usb/dwc3/ulpi.c                        |    2 ++
 drivers/usb/early/ehci-dbgp.c                  |    2 ++
 drivers/usb/early/xhci-dbc.c                   |    2 ++
 drivers/usb/early/xhci-dbc.h                   |    2 ++
 drivers/usb/gadget/Makefile                    |    1 +
 drivers/usb/gadget/composite.c                 |    2 ++
 drivers/usb/gadget/config.c                    |    2 ++
 drivers/usb/gadget/configfs.c                  |    1 +
 drivers/usb/gadget/configfs.h                  |    1 +
 drivers/usb/gadget/epautoconf.c                |    2 ++
 drivers/usb/gadget/function/Makefile           |    1 +
 drivers/usb/gadget/function/f_acm.c            |    2 ++
 drivers/usb/gadget/function/f_ecm.c            |    2 ++
 drivers/usb/gadget/function/f_eem.c            |    2 ++
 drivers/usb/gadget/function/f_fs.c             |    2 ++
 drivers/usb/gadget/function/f_hid.c            |    2 ++
 drivers/usb/gadget/function/f_loopback.c       |    2 ++
 drivers/usb/gadget/function/f_mass_storage.c   |    2 ++
 drivers/usb/gadget/function/f_mass_storage.h   |    1 +
 drivers/usb/gadget/function/f_midi.c           |    2 ++
 drivers/usb/gadget/function/f_ncm.c            |    2 ++
 drivers/usb/gadget/function/f_obex.c           |    2 ++
 drivers/usb/gadget/function/f_phonet.c         |    2 ++
 drivers/usb/gadget/function/f_printer.c        |    2 ++
 drivers/usb/gadget/function/f_rndis.c          |    2 ++
 drivers/usb/gadget/function/f_serial.c         |    2 ++
 drivers/usb/gadget/function/f_sourcesink.c     |    2 ++
 drivers/usb/gadget/function/f_subset.c         |    2 ++
 drivers/usb/gadget/function/f_tcm.c            |    2 ++
 drivers/usb/gadget/function/f_uac1.c           |    2 ++
 drivers/usb/gadget/function/f_uac1_legacy.c    |    2 ++
 drivers/usb/gadget/function/f_uac2.c           |    2 ++
 drivers/usb/gadget/function/f_uvc.c            |    2 ++
 drivers/usb/gadget/function/f_uvc.h            |    2 ++
 drivers/usb/gadget/function/g_zero.h           |    2 ++
 drivers/usb/gadget/function/rndis.c            |    2 ++
 drivers/usb/gadget/function/rndis.h            |    2 ++
 drivers/usb/gadget/function/storage_common.c   |    2 ++
 drivers/usb/gadget/function/storage_common.h   |    1 +
 drivers/usb/gadget/function/tcm.h              |    1 +
 drivers/usb/gadget/function/u_audio.c          |    2 ++
 drivers/usb/gadget/function/u_audio.h          |    2 ++
 drivers/usb/gadget/function/u_ecm.h            |    2 ++
 drivers/usb/gadget/function/u_eem.h            |    2 ++
 drivers/usb/gadget/function/u_ether.c          |    2 ++
 drivers/usb/gadget/function/u_ether.h          |    2 ++
 drivers/usb/gadget/function/u_ether_configfs.h |    2 ++
 drivers/usb/gadget/function/u_fs.h             |    2 ++
 drivers/usb/gadget/function/u_gether.h         |    2 ++
 drivers/usb/gadget/function/u_hid.h            |    2 ++
 drivers/usb/gadget/function/u_midi.h           |    2 ++
 drivers/usb/gadget/function/u_ncm.h            |    2 ++
 drivers/usb/gadget/function/u_phonet.h         |    2 ++
 drivers/usb/gadget/function/u_printer.h        |    2 ++
 drivers/usb/gadget/function/u_rndis.h          |    2 ++
 drivers/usb/gadget/function/u_serial.c         |    2 ++
 drivers/usb/gadget/function/u_serial.h         |    2 ++
 drivers/usb/gadget/function/u_tcm.h            |    2 ++
 drivers/usb/gadget/function/u_uac1.h           |    2 ++
 drivers/usb/gadget/function/u_uac1_legacy.c    |    2 ++
 drivers/usb/gadget/function/u_uac1_legacy.h    |    2 ++
 drivers/usb/gadget/function/u_uac2.h           |    2 ++
 drivers/usb/gadget/function/u_uvc.h            |    2 ++
 drivers/usb/gadget/function/uvc.h              |    2 ++
 drivers/usb/gadget/function/uvc_configfs.c     |    2 ++
 drivers/usb/gadget/function/uvc_configfs.h     |    2 ++
 drivers/usb/gadget/function/uvc_queue.c        |    2 ++
 drivers/usb/gadget/function/uvc_queue.h        |    1 +
 drivers/usb/gadget/function/uvc_v4l2.c         |    2 ++
 drivers/usb/gadget/function/uvc_v4l2.h         |    2 ++
 drivers/usb/gadget/function/uvc_video.c        |    2 ++
 drivers/usb/gadget/function/uvc_video.h        |    2 ++
 drivers/usb/gadget/functions.c                 |    1 +
 drivers/usb/gadget/legacy/Makefile             |    1 +
 drivers/usb/gadget/legacy/acm_ms.c             |    2 ++
 drivers/usb/gadget/legacy/audio.c              |    2 ++
 drivers/usb/gadget/legacy/cdc2.c               |    2 ++
 drivers/usb/gadget/legacy/dbgp.c               |    2 ++
 drivers/usb/gadget/legacy/ether.c              |    2 ++
 drivers/usb/gadget/legacy/g_ffs.c              |    2 ++
 drivers/usb/gadget/legacy/gmidi.c              |    2 ++
 drivers/usb/gadget/legacy/hid.c                |    2 ++
 drivers/usb/gadget/legacy/inode.c              |    2 ++
 drivers/usb/gadget/legacy/mass_storage.c       |    2 ++
 drivers/usb/gadget/legacy/multi.c              |    2 ++
 drivers/usb/gadget/legacy/ncm.c                |    2 ++
 drivers/usb/gadget/legacy/nokia.c              |    2 ++
 drivers/usb/gadget/legacy/printer.c            |    2 ++
 drivers/usb/gadget/legacy/serial.c             |    2 ++
 drivers/usb/gadget/legacy/tcm_usb_gadget.c     |    2 ++
 drivers/usb/gadget/legacy/webcam.c             |    2 ++
 drivers/usb/gadget/legacy/zero.c               |    2 ++
 drivers/usb/gadget/u_f.c                       |    2 ++
 drivers/usb/gadget/u_f.h                       |    2 ++
 drivers/usb/gadget/u_os_desc.h                 |    2 ++
 drivers/usb/gadget/udc/Makefile                |    1 +
 drivers/usb/gadget/udc/amd5536udc.h            |    2 ++
 drivers/usb/gadget/udc/amd5536udc_pci.c        |    2 ++
 drivers/usb/gadget/udc/at91_udc.c              |    2 ++
 drivers/usb/gadget/udc/at91_udc.h              |    2 ++
 drivers/usb/gadget/udc/atmel_usba_udc.c        |    2 ++
 drivers/usb/gadget/udc/atmel_usba_udc.h        |    2 ++
 drivers/usb/gadget/udc/bcm63xx_udc.c           |    2 ++
 drivers/usb/gadget/udc/bdc/Makefile            |    1 +
 drivers/usb/gadget/udc/bdc/bdc.h               |    2 ++
 drivers/usb/gadget/udc/bdc/bdc_cmd.c           |    2 ++
 drivers/usb/gadget/udc/bdc/bdc_cmd.h           |    2 ++
 drivers/usb/gadget/udc/bdc/bdc_core.c          |    2 ++
 drivers/usb/gadget/udc/bdc/bdc_dbg.c           |    2 ++
 drivers/usb/gadget/udc/bdc/bdc_dbg.h           |    2 ++
 drivers/usb/gadget/udc/bdc/bdc_ep.c            |    2 ++
 drivers/usb/gadget/udc/bdc/bdc_ep.h            |    2 ++
 drivers/usb/gadget/udc/bdc/bdc_pci.c           |    2 ++
 drivers/usb/gadget/udc/bdc/bdc_udc.c           |    2 ++
 drivers/usb/gadget/udc/core.c                  |    2 ++
 drivers/usb/gadget/udc/dummy_hcd.c             |    2 ++
 drivers/usb/gadget/udc/fotg210-udc.c           |    2 ++
 drivers/usb/gadget/udc/fotg210.h               |    2 ++
 drivers/usb/gadget/udc/fsl_mxc_udc.c           |    2 ++
 drivers/usb/gadget/udc/fsl_qe_udc.c            |    2 ++
 drivers/usb/gadget/udc/fsl_qe_udc.h            |    2 ++
 drivers/usb/gadget/udc/fsl_udc_core.c          |    2 ++
 drivers/usb/gadget/udc/fsl_usb2_udc.h          |    2 ++
 drivers/usb/gadget/udc/fusb300_udc.c           |    2 ++
 drivers/usb/gadget/udc/fusb300_udc.h           |    2 ++
 drivers/usb/gadget/udc/goku_udc.c              |    2 ++
 drivers/usb/gadget/udc/goku_udc.h              |    2 ++
 drivers/usb/gadget/udc/gr_udc.c                |    2 ++
 drivers/usb/gadget/udc/gr_udc.h                |    2 ++
 drivers/usb/gadget/udc/lpc32xx_udc.c           |    2 ++
 drivers/usb/gadget/udc/m66592-udc.c            |    2 ++
 drivers/usb/gadget/udc/m66592-udc.h            |    2 ++
 drivers/usb/gadget/udc/mv_u3d.h                |    2 ++
 drivers/usb/gadget/udc/mv_u3d_core.c           |    2 ++
 drivers/usb/gadget/udc/mv_udc.h                |    2 ++
 drivers/usb/gadget/udc/mv_udc_core.c           |    2 ++
 drivers/usb/gadget/udc/net2272.c               |    2 ++
 drivers/usb/gadget/udc/net2272.h               |    2 ++
 drivers/usb/gadget/udc/net2280.c               |    2 ++
 drivers/usb/gadget/udc/net2280.h               |    2 ++
 drivers/usb/gadget/udc/omap_udc.c              |    2 ++
 drivers/usb/gadget/udc/omap_udc.h              |    2 ++
 drivers/usb/gadget/udc/pch_udc.c               |    2 ++
 drivers/usb/gadget/udc/pxa25x_udc.c            |    2 ++
 drivers/usb/gadget/udc/pxa25x_udc.h            |    2 ++
 drivers/usb/gadget/udc/pxa27x_udc.c            |    2 ++
 drivers/usb/gadget/udc/pxa27x_udc.h            |    2 ++
 drivers/usb/gadget/udc/r8a66597-udc.c          |    2 ++
 drivers/usb/gadget/udc/r8a66597-udc.h          |    2 ++
 drivers/usb/gadget/udc/renesas_usb3.c          |    2 ++
 drivers/usb/gadget/udc/s3c-hsudc.c             |    2 ++
 drivers/usb/gadget/udc/s3c2410_udc.c           |    2 ++
 drivers/usb/gadget/udc/s3c2410_udc.h           |    2 ++
 drivers/usb/gadget/udc/snps_udc_core.c         |    2 ++
 drivers/usb/gadget/udc/snps_udc_plat.c         |    2 ++
 drivers/usb/gadget/udc/trace.c                 |    2 ++
 drivers/usb/gadget/udc/trace.h                 |    2 ++
 drivers/usb/gadget/udc/udc-xilinx.c            |    2 ++
 drivers/usb/gadget/usbstring.c                 |    2 ++
 drivers/usb/host/Makefile                      |    1 +
 drivers/usb/host/bcma-hcd.c                    |    2 ++
 drivers/usb/host/ehci-atmel.c                  |    2 ++
 drivers/usb/host/ehci-dbg.c                    |    2 ++
 drivers/usb/host/ehci-exynos.c                 |    2 ++
 drivers/usb/host/ehci-fsl.c                    |    2 ++
 drivers/usb/host/ehci-fsl.h                    |    2 ++
 drivers/usb/host/ehci-grlib.c                  |    2 ++
 drivers/usb/host/ehci-hcd.c                    |    2 ++
 drivers/usb/host/ehci-hub.c                    |    2 ++
 drivers/usb/host/ehci-mem.c                    |    2 ++
 drivers/usb/host/ehci-msm.c                    |    2 ++
 drivers/usb/host/ehci-mv.c                     |    2 ++
 drivers/usb/host/ehci-mxc.c                    |    2 ++
 drivers/usb/host/ehci-omap.c                   |    2 ++
 drivers/usb/host/ehci-orion.c                  |    2 ++
 drivers/usb/host/ehci-pci.c                    |    2 ++
 drivers/usb/host/ehci-platform.c               |    2 ++
 drivers/usb/host/ehci-pmcmsp.c                 |    2 ++
 drivers/usb/host/ehci-ppc-of.c                 |    2 ++
 drivers/usb/host/ehci-ps3.c                    |    2 ++
 drivers/usb/host/ehci-q.c                      |    2 ++
 drivers/usb/host/ehci-sched.c                  |    2 ++
 drivers/usb/host/ehci-sh.c                     |    2 ++
 drivers/usb/host/ehci-spear.c                  |    2 ++
 drivers/usb/host/ehci-st.c                     |    2 ++
 drivers/usb/host/ehci-sysfs.c                  |    2 ++
 drivers/usb/host/ehci-tegra.c                  |    2 ++
 drivers/usb/host/ehci-tilegx.c                 |    2 ++
 drivers/usb/host/ehci-timer.c                  |    2 ++
 drivers/usb/host/ehci-w90x900.c                |    2 ++
 drivers/usb/host/ehci-xilinx-of.c              |    2 ++
 drivers/usb/host/ehci.h                        |    2 ++
 drivers/usb/host/fhci-dbg.c                    |    2 ++
 drivers/usb/host/fhci-hcd.c                    |    2 ++
 drivers/usb/host/fhci-hub.c                    |    2 ++
 drivers/usb/host/fhci-mem.c                    |    2 ++
 drivers/usb/host/fhci-q.c                      |    2 ++
 drivers/usb/host/fhci-sched.c                  |    2 ++
 drivers/usb/host/fhci-tds.c                    |    2 ++
 drivers/usb/host/fhci.h                        |    2 ++
 drivers/usb/host/fotg210-hcd.c                 |    2 ++
 drivers/usb/host/fotg210.h                     |    1 +
 drivers/usb/host/fsl-mph-dr-of.c               |    2 ++
 drivers/usb/host/hwa-hc.c                      |    2 ++
 drivers/usb/host/imx21-dbg.c                   |    2 ++
 drivers/usb/host/imx21-hcd.c                   |    2 ++
 drivers/usb/host/imx21-hcd.h                   |    2 ++
 drivers/usb/host/isp116x-hcd.c                 |    2 ++
 drivers/usb/host/isp116x.h                     |    2 ++
 drivers/usb/host/isp1362-hcd.c                 |    2 ++
 drivers/usb/host/isp1362.h                     |    2 ++
 drivers/usb/host/max3421-hcd.c                 |    2 ++
 drivers/usb/host/ohci-at91.c                   |    2 ++
 drivers/usb/host/ohci-da8xx.c                  |    2 ++
 drivers/usb/host/ohci-dbg.c                    |    2 ++
 drivers/usb/host/ohci-exynos.c                 |    2 ++
 drivers/usb/host/ohci-hcd.c                    |    2 ++
 drivers/usb/host/ohci-hub.c                    |    2 ++
 drivers/usb/host/ohci-mem.c                    |    2 ++
 drivers/usb/host/ohci-nxp.c                    |    2 ++
 drivers/usb/host/ohci-omap.c                   |    2 ++
 drivers/usb/host/ohci-pci.c                    |    2 ++
 drivers/usb/host/ohci-platform.c               |    2 ++
 drivers/usb/host/ohci-ppc-of.c                 |    2 ++
 drivers/usb/host/ohci-ps3.c                    |    2 ++
 drivers/usb/host/ohci-pxa27x.c                 |    2 ++
 drivers/usb/host/ohci-q.c                      |    2 ++
 drivers/usb/host/ohci-s3c2410.c                |    2 ++
 drivers/usb/host/ohci-sa1111.c                 |    2 ++
 drivers/usb/host/ohci-sm501.c                  |    2 ++
 drivers/usb/host/ohci-spear.c                  |    2 ++
 drivers/usb/host/ohci-st.c                     |    2 ++
 drivers/usb/host/ohci-tilegx.c                 |    2 ++
 drivers/usb/host/ohci-tmio.c                   |    2 ++
 drivers/usb/host/ohci.h                        |    2 ++
 drivers/usb/host/oxu210hp-hcd.c                |    2 ++
 drivers/usb/host/oxu210hp.h                    |    2 ++
 drivers/usb/host/pci-quirks.c                  |    2 ++
 drivers/usb/host/pci-quirks.h                  |    1 +
 drivers/usb/host/r8a66597-hcd.c                |    2 ++
 drivers/usb/host/r8a66597.h                    |    2 ++
 drivers/usb/host/sl811-hcd.c                   |    2 ++
 drivers/usb/host/sl811.h                       |    2 ++
 drivers/usb/host/sl811_cs.c                    |    2 ++
 drivers/usb/host/ssb-hcd.c                     |    2 ++
 drivers/usb/host/u132-hcd.c                    |    2 ++
 drivers/usb/host/uhci-debug.c                  |    2 ++
 drivers/usb/host/uhci-grlib.c                  |    2 ++
 drivers/usb/host/uhci-hcd.c                    |    2 ++
 drivers/usb/host/uhci-hcd.h                    |    1 +
 drivers/usb/host/uhci-hub.c                    |    2 ++
 drivers/usb/host/uhci-pci.c                    |    2 ++
 drivers/usb/host/uhci-platform.c               |    2 ++
 drivers/usb/host/uhci-q.c                      |    2 ++
 drivers/usb/host/whci/asl.c                    |    2 ++
 drivers/usb/host/whci/debug.c                  |    2 ++
 drivers/usb/host/whci/hcd.c                    |    2 ++
 drivers/usb/host/whci/hw.c                     |    2 ++
 drivers/usb/host/whci/init.c                   |    2 ++
 drivers/usb/host/whci/int.c                    |    2 ++
 drivers/usb/host/whci/pzl.c                    |    2 ++
 drivers/usb/host/whci/qset.c                   |    2 ++
 drivers/usb/host/whci/whcd.h                   |    2 ++
 drivers/usb/host/whci/whci-hc.h                |    2 ++
 drivers/usb/host/whci/wusb.c                   |    2 ++
 drivers/usb/host/xhci-dbg.c                    |    2 ++
 drivers/usb/host/xhci-ext-caps.h               |    2 ++
 drivers/usb/host/xhci-hub.c                    |    2 ++
 drivers/usb/host/xhci-mem.c                    |    2 ++
 drivers/usb/host/xhci-mtk-sch.c                |    2 ++
 drivers/usb/host/xhci-mtk.c                    |    2 ++
 drivers/usb/host/xhci-mtk.h                    |    2 ++
 drivers/usb/host/xhci-mvebu.c                  |    2 ++
 drivers/usb/host/xhci-mvebu.h                  |    2 ++
 drivers/usb/host/xhci-pci.c                    |    2 ++
 drivers/usb/host/xhci-plat.c                   |    2 ++
 drivers/usb/host/xhci-plat.h                   |    2 ++
 drivers/usb/host/xhci-rcar.c                   |    2 ++
 drivers/usb/host/xhci-rcar.h                   |    2 ++
 drivers/usb/host/xhci-ring.c                   |    2 ++
 drivers/usb/host/xhci-tegra.c                  |    2 ++
 drivers/usb/host/xhci-trace.c                  |    2 ++
 drivers/usb/host/xhci-trace.h                  |    2 ++
 drivers/usb/host/xhci.c                        |    2 ++
 drivers/usb/host/xhci.h                        |    2 ++
 drivers/usb/image/mdc800.c                     |    2 ++
 drivers/usb/image/microtek.c                   |    2 ++
 drivers/usb/isp1760/isp1760-core.c             |    2 ++
 drivers/usb/isp1760/isp1760-core.h             |    2 ++
 drivers/usb/isp1760/isp1760-hcd.c              |    2 ++
 drivers/usb/isp1760/isp1760-hcd.h              |    1 +
 drivers/usb/isp1760/isp1760-if.c               |    2 ++
 drivers/usb/isp1760/isp1760-regs.h             |    2 ++
 drivers/usb/isp1760/isp1760-udc.c              |    2 ++
 drivers/usb/isp1760/isp1760-udc.h              |    2 ++
 drivers/usb/misc/Makefile                      |    1 +
 drivers/usb/misc/adutux.c                      |    2 ++
 drivers/usb/misc/appledisplay.c                |    2 ++
 drivers/usb/misc/chaoskey.c                    |    2 ++
 drivers/usb/misc/cypress_cy7c63.c              |    2 ++
 drivers/usb/misc/cytherm.c                     |    2 ++
 drivers/usb/misc/ehset.c                       |    2 ++
 drivers/usb/misc/emi26.c                       |    2 ++
 drivers/usb/misc/emi62.c                       |    2 ++
 drivers/usb/misc/ezusb.c                       |    2 ++
 drivers/usb/misc/ftdi-elan.c                   |    2 ++
 drivers/usb/misc/idmouse.c                     |    2 ++
 drivers/usb/misc/iowarrior.c                   |    2 ++
 drivers/usb/misc/isight_firmware.c             |    2 ++
 drivers/usb/misc/ldusb.c                       |    2 ++
 drivers/usb/misc/legousbtower.c                |    2 ++
 drivers/usb/misc/lvstest.c                     |    2 ++
 drivers/usb/misc/rio500.c                      |    6 +++++-
 drivers/usb/misc/rio500_usb.h                  |    1 +
 drivers/usb/misc/sisusbvga/sisusb.c            |    2 ++
 drivers/usb/misc/sisusbvga/sisusb.h            |    2 ++
 drivers/usb/misc/sisusbvga/sisusb_con.c        |    2 ++
 drivers/usb/misc/sisusbvga/sisusb_init.c       |    2 ++
 drivers/usb/misc/sisusbvga/sisusb_init.h       |    6 +++++-
 drivers/usb/misc/sisusbvga/sisusb_struct.h     |    2 ++
 drivers/usb/misc/trancevibrator.c              |    2 ++
 drivers/usb/misc/usb251xb.c                    |    2 ++
 drivers/usb/misc/usb3503.c                     |    2 ++
 drivers/usb/misc/usb4604.c                     |    2 ++
 drivers/usb/misc/usb_u132.h                    |    2 ++
 drivers/usb/misc/usblcd.c                      |    1 +
 drivers/usb/misc/usbsevseg.c                   |    2 ++
 drivers/usb/misc/usbtest.c                     |    1 +
 drivers/usb/misc/uss720.c                      |    6 +++++-
 drivers/usb/misc/yurex.c                       |    2 ++
 drivers/usb/mon/mon_bin.c                      |    2 ++
 drivers/usb/mon/mon_main.c                     |    2 ++
 drivers/usb/mon/mon_stat.c                     |    2 ++
 drivers/usb/mon/mon_text.c                     |    2 ++
 drivers/usb/mon/usb_mon.h                      |    2 ++
 drivers/usb/mtu3/Makefile                      |    1 +
 drivers/usb/mtu3/mtu3.h                        |    2 ++
 drivers/usb/mtu3/mtu3_core.c                   |    2 ++
 drivers/usb/mtu3/mtu3_dr.c                     |    2 ++
 drivers/usb/mtu3/mtu3_dr.h                     |    2 ++
 drivers/usb/mtu3/mtu3_gadget.c                 |    2 ++
 drivers/usb/mtu3/mtu3_gadget_ep0.c             |    2 ++
 drivers/usb/mtu3/mtu3_host.c                   |    2 ++
 drivers/usb/mtu3/mtu3_hw_regs.h                |    2 ++
 drivers/usb/mtu3/mtu3_plat.c                   |    2 ++
 drivers/usb/mtu3/mtu3_qmu.c                    |    2 ++
 drivers/usb/mtu3/mtu3_qmu.h                    |    2 ++
 drivers/usb/musb/Makefile                      |    1 +
 drivers/usb/musb/am35x.c                       |    2 ++
 drivers/usb/musb/blackfin.c                    |    2 ++
 drivers/usb/musb/blackfin.h                    |    2 ++
 drivers/usb/musb/cppi_dma.c                    |    2 ++
 drivers/usb/musb/cppi_dma.h                    |    6 +++++-
 drivers/usb/musb/da8xx.c                       |    2 ++
 drivers/usb/musb/davinci.c                     |    2 ++
 drivers/usb/musb/davinci.h                     |    2 ++
 drivers/usb/musb/jz4740.c                      |    2 ++
 drivers/usb/musb/musb_am335x.c                 |    1 +
 drivers/usb/musb/musb_core.c                   |    2 ++
 drivers/usb/musb/musb_core.h                   |    2 ++
 drivers/usb/musb/musb_cppi41.c                 |    1 +
 drivers/usb/musb/musb_debug.h                  |    2 ++
 drivers/usb/musb/musb_debugfs.c                |    2 ++
 drivers/usb/musb/musb_dma.h                    |    2 ++
 drivers/usb/musb/musb_dsps.c                   |    2 ++
 drivers/usb/musb/musb_gadget.c                 |    2 ++
 drivers/usb/musb/musb_gadget.h                 |    2 ++
 drivers/usb/musb/musb_gadget_ep0.c             |    2 ++
 drivers/usb/musb/musb_host.c                   |    2 ++
 drivers/usb/musb/musb_host.h                   |    2 ++
 drivers/usb/musb/musb_io.h                     |    2 ++
 drivers/usb/musb/musb_regs.h                   |    2 ++
 drivers/usb/musb/musb_trace.c                  |    2 ++
 drivers/usb/musb/musb_trace.h                  |    2 ++
 drivers/usb/musb/musb_virthub.c                |    2 ++
 drivers/usb/musb/musbhsdma.c                   |    2 ++
 drivers/usb/musb/musbhsdma.h                   |    2 ++
 drivers/usb/musb/omap2430.c                    |    2 ++
 drivers/usb/musb/omap2430.h                    |    2 ++
 drivers/usb/musb/sunxi.c                       |    2 ++
 drivers/usb/musb/tusb6010.c                    |    2 ++
 drivers/usb/musb/tusb6010.h                    |    2 ++
 drivers/usb/musb/tusb6010_omap.c               |    2 ++
 drivers/usb/musb/ux500.c                       |    2 ++
 drivers/usb/musb/ux500_dma.c                   |    2 ++
 drivers/usb/phy/Makefile                       |    1 +
 drivers/usb/phy/of.c                           |    2 ++
 drivers/usb/phy/phy-ab8500-usb.c               |    2 ++
 drivers/usb/phy/phy-am335x-control.c           |    1 +
 drivers/usb/phy/phy-am335x-control.h           |    1 +
 drivers/usb/phy/phy-am335x.c                   |    1 +
 drivers/usb/phy/phy-fsl-usb.c                  |    2 ++
 drivers/usb/phy/phy-fsl-usb.h                  |    2 ++
 drivers/usb/phy/phy-generic.c                  |    2 ++
 drivers/usb/phy/phy-generic.h                  |    1 +
 drivers/usb/phy/phy-gpio-vbus-usb.c            |    2 ++
 drivers/usb/phy/phy-isp1301-omap.c             |    2 ++
 drivers/usb/phy/phy-isp1301.c                  |    2 ++
 drivers/usb/phy/phy-keystone.c                 |    2 ++
 drivers/usb/phy/phy-msm-usb.c                  |    2 ++
 drivers/usb/phy/phy-mv-usb.c                   |    2 ++
 drivers/usb/phy/phy-mv-usb.h                   |    2 ++
 drivers/usb/phy/phy-mxs-usb.c                  |    2 ++
 drivers/usb/phy/phy-omap-otg.c                 |    2 ++
 drivers/usb/phy/phy-qcom-8x16-usb.c            |    2 ++
 drivers/usb/phy/phy-tahvo.c                    |    2 ++
 drivers/usb/phy/phy-tegra-usb.c                |    2 ++
 drivers/usb/phy/phy-twl6030-usb.c              |    2 ++
 drivers/usb/phy/phy-ulpi-viewport.c            |    2 ++
 drivers/usb/phy/phy-ulpi.c                     |    2 ++
 drivers/usb/phy/phy.c                          |    2 ++
 drivers/usb/renesas_usbhs/Makefile             |    1 +
 drivers/usb/renesas_usbhs/common.c             |    2 ++
 drivers/usb/renesas_usbhs/common.h             |    2 ++
 drivers/usb/renesas_usbhs/fifo.c               |    2 ++
 drivers/usb/renesas_usbhs/fifo.h               |    2 ++
 drivers/usb/renesas_usbhs/mod.c                |    2 ++
 drivers/usb/renesas_usbhs/mod.h                |    2 ++
 drivers/usb/renesas_usbhs/mod_gadget.c         |    2 ++
 drivers/usb/renesas_usbhs/mod_host.c           |    2 ++
 drivers/usb/renesas_usbhs/pipe.c               |    2 ++
 drivers/usb/renesas_usbhs/pipe.h               |    2 ++
 drivers/usb/renesas_usbhs/rcar2.c              |    2 ++
 drivers/usb/renesas_usbhs/rcar3.c              |    2 ++
 drivers/usb/serial/Makefile                    |    1 +
 drivers/usb/serial/aircable.c                  |    2 ++
 drivers/usb/serial/ark3116.c                   |    2 ++
 drivers/usb/serial/belkin_sa.c                 |    2 ++
 drivers/usb/serial/belkin_sa.h                 |    2 ++
 drivers/usb/serial/bus.c                       |    2 ++
 drivers/usb/serial/ch341.c                     |    2 ++
 drivers/usb/serial/console.c                   |    2 ++
 drivers/usb/serial/cp210x.c                    |    2 ++
 drivers/usb/serial/cyberjack.c                 |    2 ++
 drivers/usb/serial/cypress_m8.c                |    2 ++
 drivers/usb/serial/cypress_m8.h                |    1 +
 drivers/usb/serial/digi_acceleport.c           |    2 ++
 drivers/usb/serial/empeg.c                     |    2 ++
 drivers/usb/serial/f81232.c                    |    2 ++
 drivers/usb/serial/f81534.c                    |    2 ++
 drivers/usb/serial/ftdi_sio.c                  |    2 ++
 drivers/usb/serial/ftdi_sio.h                  |    2 ++
 drivers/usb/serial/ftdi_sio_ids.h              |    2 ++
 drivers/usb/serial/garmin_gps.c                |    2 ++
 drivers/usb/serial/generic.c                   |    2 ++
 drivers/usb/serial/io_16654.h                  |    1 +
 drivers/usb/serial/io_edgeport.c               |    2 ++
 drivers/usb/serial/io_edgeport.h               |    1 +
 drivers/usb/serial/io_ionsp.h                  |    1 +
 drivers/usb/serial/io_ti.c                     |    2 ++
 drivers/usb/serial/io_ti.h                     |    1 +
 drivers/usb/serial/io_usbvend.h                |    1 +
 drivers/usb/serial/ipaq.c                      |    2 ++
 drivers/usb/serial/ipw.c                       |    2 ++
 drivers/usb/serial/ir-usb.c                    |    2 ++
 drivers/usb/serial/iuu_phoenix.c               |    2 ++
 drivers/usb/serial/iuu_phoenix.h               |    2 ++
 drivers/usb/serial/keyspan.c                   |    2 ++
 drivers/usb/serial/keyspan_pda.c               |    2 ++
 drivers/usb/serial/kl5kusb105.c                |    2 ++
 drivers/usb/serial/kl5kusb105.h                |    2 ++
 drivers/usb/serial/kobil_sct.c                 |    2 ++
 drivers/usb/serial/kobil_sct.h                 |    6 +++++-
 drivers/usb/serial/mct_u232.c                  |    2 ++
 drivers/usb/serial/mct_u232.h                  |    2 ++
 drivers/usb/serial/metro-usb.c                 |    2 ++
 drivers/usb/serial/mos7720.c                   |    2 ++
 drivers/usb/serial/mos7840.c                   |    2 ++
 drivers/usb/serial/mxuport.c                   |    2 ++
 drivers/usb/serial/navman.c                    |    2 ++
 drivers/usb/serial/omninet.c                   |    2 ++
 drivers/usb/serial/opticon.c                   |    2 ++
 drivers/usb/serial/option.c                    |    2 ++
 drivers/usb/serial/oti6858.c                   |    2 ++
 drivers/usb/serial/oti6858.h                   |    2 ++
 drivers/usb/serial/pl2303.c                    |    2 ++
 drivers/usb/serial/pl2303.h                    |    2 ++
 drivers/usb/serial/qcaux.c                     |    2 ++
 drivers/usb/serial/qcserial.c                  |    2 ++
 drivers/usb/serial/quatech2.c                  |    2 ++
 drivers/usb/serial/safe_serial.c               |    2 ++
 drivers/usb/serial/sierra.c                    |    2 ++
 drivers/usb/serial/spcp8x5.c                   |    2 ++
 drivers/usb/serial/ssu100.c                    |    2 ++
 drivers/usb/serial/symbolserial.c              |    2 ++
 drivers/usb/serial/ti_usb_3410_5052.c          |    2 ++
 drivers/usb/serial/upd78f0730.c                |    2 ++
 drivers/usb/serial/usb-serial-simple.c         |    2 ++
 drivers/usb/serial/usb-serial.c                |    2 ++
 drivers/usb/serial/usb-wwan.h                  |    2 ++
 drivers/usb/serial/usb_debug.c                 |    2 ++
 drivers/usb/serial/usb_wwan.c                  |    2 ++
 drivers/usb/serial/visor.c                     |    2 ++
 drivers/usb/serial/visor.h                     |    2 ++
 drivers/usb/serial/whiteheat.c                 |    2 ++
 drivers/usb/serial/whiteheat.h                 |    2 ++
 drivers/usb/serial/wishbone-serial.c           |    2 ++
 drivers/usb/serial/xsens_mt.c                  |    2 ++
 drivers/usb/storage/Makefile                   |    1 +
 drivers/usb/storage/alauda.c                   |    2 ++
 drivers/usb/storage/cypress_atacb.c            |    2 ++
 drivers/usb/storage/datafab.c                  |    2 ++
 drivers/usb/storage/debug.c                    |    2 ++
 drivers/usb/storage/debug.h                    |    2 ++
 drivers/usb/storage/ene_ub6250.c               |    2 ++
 drivers/usb/storage/freecom.c                  |    2 ++
 drivers/usb/storage/initializers.c             |    2 ++
 drivers/usb/storage/initializers.h             |    2 ++
 drivers/usb/storage/isd200.c                   |    2 ++
 drivers/usb/storage/jumpshot.c                 |    2 ++
 drivers/usb/storage/karma.c                    |    2 ++
 drivers/usb/storage/onetouch.c                 |    2 ++
 drivers/usb/storage/option_ms.c                |    2 ++
 drivers/usb/storage/option_ms.h                |    1 +
 drivers/usb/storage/protocol.c                 |    2 ++
 drivers/usb/storage/protocol.h                 |    2 ++
 drivers/usb/storage/realtek_cr.c               |    2 ++
 drivers/usb/storage/scsiglue.c                 |    2 ++
 drivers/usb/storage/scsiglue.h                 |    2 ++
 drivers/usb/storage/sddr09.c                   |    2 ++
 drivers/usb/storage/sddr55.c                   |    2 ++
 drivers/usb/storage/shuttle_usbat.c            |    2 ++
 drivers/usb/storage/sierra_ms.c                |    1 +
 drivers/usb/storage/sierra_ms.h                |    1 +
 drivers/usb/storage/transport.c                |    2 ++
 drivers/usb/storage/transport.h                |    2 ++
 drivers/usb/storage/uas-detect.h               |    1 +
 drivers/usb/storage/uas.c                      |    2 ++
 drivers/usb/storage/unusual_alauda.h           |    2 ++
 drivers/usb/storage/unusual_cypress.h          |    2 ++
 drivers/usb/storage/unusual_datafab.h          |    2 ++
 drivers/usb/storage/unusual_devs.h             |    2 ++
 drivers/usb/storage/unusual_ene_ub6250.h       |    2 ++
 drivers/usb/storage/unusual_freecom.h          |    2 ++
 drivers/usb/storage/unusual_isd200.h           |    2 ++
 drivers/usb/storage/unusual_jumpshot.h         |    2 ++
 drivers/usb/storage/unusual_karma.h            |    2 ++
 drivers/usb/storage/unusual_onetouch.h         |    2 ++
 drivers/usb/storage/unusual_realtek.h          |    2 ++
 drivers/usb/storage/unusual_sddr09.h           |    2 ++
 drivers/usb/storage/unusual_sddr55.h           |    2 ++
 drivers/usb/storage/unusual_uas.h              |    2 ++
 drivers/usb/storage/unusual_usbat.h            |    2 ++
 drivers/usb/storage/usb.c                      |    2 ++
 drivers/usb/storage/usb.h                      |    2 ++
 drivers/usb/storage/usual-tables.c             |    2 ++
 drivers/usb/typec/typec.c                      |    2 ++
 drivers/usb/typec/typec_wcove.c                |    2 ++
 drivers/usb/typec/ucsi/Makefile                |    1 +
 drivers/usb/typec/ucsi/debug.h                 |    1 +
 drivers/usb/typec/ucsi/trace.h                 |    1 +
 drivers/usb/typec/ucsi/ucsi.c                  |    2 ++
 drivers/usb/typec/ucsi/ucsi.h                  |    1 +
 drivers/usb/typec/ucsi/ucsi_acpi.c             |    2 ++
 drivers/usb/usb-skeleton.c                     |    2 ++
 drivers/usb/usbip/Makefile                     |    1 +
 drivers/usb/usbip/stub.h                       |    2 ++
 drivers/usb/usbip/stub_dev.c                   |    2 ++
 drivers/usb/usbip/stub_main.c                  |    2 ++
 drivers/usb/usbip/stub_rx.c                    |    2 ++
 drivers/usb/usbip/stub_tx.c                    |    2 ++
 drivers/usb/usbip/usbip_common.c               |    2 ++
 drivers/usb/usbip/usbip_common.h               |    2 ++
 drivers/usb/usbip/usbip_event.c                |    2 ++
 drivers/usb/usbip/vhci.h                       |    2 ++
 drivers/usb/usbip/vhci_hcd.c                   |    2 ++
 drivers/usb/usbip/vhci_rx.c                    |    2 ++
 drivers/usb/usbip/vhci_sysfs.c                 |    2 ++
 drivers/usb/usbip/vhci_tx.c                    |    2 ++
 drivers/usb/usbip/vudc.h                       |    2 ++
 drivers/usb/usbip/vudc_dev.c                   |    2 ++
 drivers/usb/usbip/vudc_main.c                  |    2 ++
 drivers/usb/usbip/vudc_rx.c                    |    2 ++
 drivers/usb/usbip/vudc_sysfs.c                 |    2 ++
 drivers/usb/usbip/vudc_transfer.c              |    2 ++
 drivers/usb/usbip/vudc_tx.c                    |    2 ++
 drivers/usb/wusbcore/Makefile                  |    1 +
 drivers/usb/wusbcore/cbaf.c                    |    2 ++
 drivers/usb/wusbcore/crypto.c                  |    2 ++
 drivers/usb/wusbcore/dev-sysfs.c               |    2 ++
 drivers/usb/wusbcore/devconnect.c              |    2 ++
 drivers/usb/wusbcore/mmc.c                     |    2 ++
 drivers/usb/wusbcore/pal.c                     |    2 ++
 drivers/usb/wusbcore/reservation.c             |    2 ++
 drivers/usb/wusbcore/rh.c                      |    2 ++
 drivers/usb/wusbcore/security.c                |    2 ++
 drivers/usb/wusbcore/wa-hc.c                   |    2 ++
 drivers/usb/wusbcore/wa-hc.h                   |    2 ++
 drivers/usb/wusbcore/wa-nep.c                  |    2 ++
 drivers/usb/wusbcore/wa-rpipe.c                |    2 ++
 drivers/usb/wusbcore/wa-xfer.c                 |    2 ++
 drivers/usb/wusbcore/wusbhc.c                  |    2 ++
 drivers/usb/wusbcore/wusbhc.h                  |    2 ++
 685 files changed, 1325 insertions(+), 6 deletions(-)
gregkh@linuxfoundation.org - Oct. 19, 2017, 8:57 a.m.
On Thu, Oct 19, 2017 at 10:50:44AM +0200, Thomas Gleixner wrote:
> On Thu, 19 Oct 2017, Greg Kroah-Hartman wrote:
> 
> > It's good to have SPDX identifiers in all files to make it easier to
> > audit the kernel tree for correct licenses.  This patch adds these
> > identifiers to all files in drivers/usb/ based on a script and data from
> > Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
> > 
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Kate Stewart <kstewart@linuxfoundation.org>
> > Cc: Philippe Ombredanne <pombredanne@nexb.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> > Unless someone really complains, I'm going to add this to my tree for
> > 4.15-rc1.
> > 
> > 
> > diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
> > index 9650b351c26c..cb8d902b801d 100644
> > --- a/drivers/usb/Makefile
> > +++ b/drivers/usb/Makefile
> > @@ -1,6 +1,7 @@
> >  #
> >  # Makefile for the kernel USB device drivers.
> >  #
> > +# SPDX-License-Identifier: GPL-2.0
> 
> The last discussion about this was to add the identifier as the first line
> of the file or as the second in case of files with a shebang in the first
> one.
> 
> I think you missed the last version of the script. Attached.

Oh, I did, thanks, let me run this again...
Geert Uytterhoeven - Oct. 19, 2017, 9:10 a.m.
Hi Greg,

On Thu, Oct 19, 2017 at 10:52 AM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> On Thu, Oct 19, 2017 at 10:49:47AM +0200, Geert Uytterhoeven wrote:
>> On Thu, Oct 19, 2017 at 10:38 AM, Greg Kroah-Hartman
>> <gregkh@linuxfoundation.org> wrote:
>> > It's good to have SPDX identifiers in all files to make it easier to
>> > audit the kernel tree for correct licenses.  This patch adds these
>> > identifiers to all files in drivers/usb/ based on a script and data from
>> > Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
>> >
>> > Cc: Thomas Gleixner <tglx@linutronix.de>
>> > Cc: Kate Stewart <kstewart@linuxfoundation.org>
>> > Cc: Philippe Ombredanne <pombredanne@nexb.com>
>> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> > ---
>> > Unless someone really complains, I'm going to add this to my tree for
>> > 4.15-rc1.
>>
>> It would be good to include a diffstat, esp. when touching +600 files.
>
> I wanted to, but I was worried it would be too long to prevent the patch
> from hitting the list :)
>
> Here it is:

[...]

Thanks!

BTW, some files seem to be "SPDX-License-Identifier: GPL-1.0+".
Was this intentional, given COPYING says the default is v2?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Thomas Gleixner - Oct. 19, 2017, 9:15 a.m.
On Thu, 19 Oct 2017, Geert Uytterhoeven wrote:
> On Thu, Oct 19, 2017 at 10:52 AM, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> > On Thu, Oct 19, 2017 at 10:49:47AM +0200, Geert Uytterhoeven wrote:
> >> On Thu, Oct 19, 2017 at 10:38 AM, Greg Kroah-Hartman
> >> <gregkh@linuxfoundation.org> wrote:
> >> > It's good to have SPDX identifiers in all files to make it easier to
> >> > audit the kernel tree for correct licenses.  This patch adds these
> >> > identifiers to all files in drivers/usb/ based on a script and data from
> >> > Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
> >> >
> >> > Cc: Thomas Gleixner <tglx@linutronix.de>
> >> > Cc: Kate Stewart <kstewart@linuxfoundation.org>
> >> > Cc: Philippe Ombredanne <pombredanne@nexb.com>
> >> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >> > ---
> >> > Unless someone really complains, I'm going to add this to my tree for
> >> > 4.15-rc1.
> >>
> >> It would be good to include a diffstat, esp. when touching +600 files.
> >
> > I wanted to, but I was worried it would be too long to prevent the patch
> > from hitting the list :)
> >
> > Here it is:
> 
> [...]
> 
> Thanks!
> 
> BTW, some files seem to be "SPDX-License-Identifier: GPL-1.0+".
> Was this intentional, given COPYING says the default is v2?

Yes. The license mentioned in the file says something like:

     This is licensed under GPL.

which is equivalent to GPL-1.0+.

Thanks,

	tglx
Felipe Balbi - Oct. 19, 2017, 9:27 a.m.
Hi,

Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes:
> On Thu, Oct 19, 2017 at 10:49:47AM +0200, Geert Uytterhoeven wrote:
>> Hi Greg,
>> 
>> On Thu, Oct 19, 2017 at 10:38 AM, Greg Kroah-Hartman
>> <gregkh@linuxfoundation.org> wrote:
>> > It's good to have SPDX identifiers in all files to make it easier to
>> > audit the kernel tree for correct licenses.  This patch adds these
>> > identifiers to all files in drivers/usb/ based on a script and data from
>> > Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
>> >
>> > Cc: Thomas Gleixner <tglx@linutronix.de>
>> > Cc: Kate Stewart <kstewart@linuxfoundation.org>
>> > Cc: Philippe Ombredanne <pombredanne@nexb.com>
>> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> > ---
>> > Unless someone really complains, I'm going to add this to my tree for
>> > 4.15-rc1.
>> 
>> It would be good to include a diffstat, esp. when touching +600 files.
>
> I wanted to, but I was worried it would be too long to prevent the patch
> from hitting the list :)
>
> Here it is:
>
>  drivers/usb/Makefile                           |    1 +
>  drivers/usb/atm/Makefile                       |    1 +
>  drivers/usb/atm/cxacru.c                       |    1 +
>  drivers/usb/atm/speedtch.c                     |    1 +
>  drivers/usb/atm/ueagle-atm.c                   |    2 ++
>  drivers/usb/atm/usbatm.c                       |    1 +
>  drivers/usb/atm/usbatm.h                       |    1 +
>  drivers/usb/atm/xusbatm.c                      |    1 +
>  drivers/usb/c67x00/c67x00-drv.c                |    2 ++
>  drivers/usb/c67x00/c67x00-hcd.c                |    2 ++
>  drivers/usb/c67x00/c67x00-hcd.h                |    2 ++
>  drivers/usb/c67x00/c67x00-ll-hpi.c             |    2 ++
>  drivers/usb/c67x00/c67x00-sched.c              |    2 ++
>  drivers/usb/c67x00/c67x00.h                    |    2 ++
>  drivers/usb/chipidea/Makefile                  |    1 +
>  drivers/usb/chipidea/bits.h                    |    2 ++
>  drivers/usb/chipidea/ci.h                      |    2 ++
>  drivers/usb/chipidea/ci_hdrc_imx.c             |    2 ++
>  drivers/usb/chipidea/ci_hdrc_imx.h             |    2 ++
>  drivers/usb/chipidea/ci_hdrc_msm.c             |    2 ++
>  drivers/usb/chipidea/ci_hdrc_pci.c             |    2 ++
>  drivers/usb/chipidea/ci_hdrc_usb2.c            |    2 ++
>  drivers/usb/chipidea/ci_hdrc_zevio.c           |    2 ++
>  drivers/usb/chipidea/core.c                    |    2 ++
>  drivers/usb/chipidea/debug.c                   |    1 +
>  drivers/usb/chipidea/host.c                    |    2 ++
>  drivers/usb/chipidea/host.h                    |    1 +
>  drivers/usb/chipidea/otg.c                     |    2 ++
>  drivers/usb/chipidea/otg.h                     |    2 ++
>  drivers/usb/chipidea/otg_fsm.c                 |    2 ++
>  drivers/usb/chipidea/otg_fsm.h                 |    2 ++
>  drivers/usb/chipidea/udc.c                     |    2 ++
>  drivers/usb/chipidea/udc.h                     |    2 ++
>  drivers/usb/chipidea/ulpi.c                    |    2 ++
>  drivers/usb/chipidea/usbmisc_imx.c             |    2 ++
>  drivers/usb/class/cdc-acm.c                    |    2 ++
>  drivers/usb/class/cdc-acm.h                    |    2 ++
>  drivers/usb/class/cdc-wdm.c                    |    2 ++
>  drivers/usb/class/usblp.c                      |    2 ++
>  drivers/usb/class/usbtmc.c                     |    2 ++
>  drivers/usb/common/Makefile                    |    1 +
>  drivers/usb/common/common.c                    |    2 ++
>  drivers/usb/common/led.c                       |    2 ++
>  drivers/usb/common/ulpi.c                      |    2 ++
>  drivers/usb/common/usb-otg-fsm.c               |    2 ++
>  drivers/usb/core/Makefile                      |    1 +
>  drivers/usb/core/devices.c                     |    2 ++
>  drivers/usb/core/devio.c                       |    6 +++++-
>  drivers/usb/core/hcd-pci.c                     |    2 ++
>  drivers/usb/core/hcd.c                         |    2 ++
>  drivers/usb/core/hub.h                         |    2 ++
>  drivers/usb/core/ledtrig-usbport.c             |    2 ++
>  drivers/usb/core/of.c                          |    2 ++
>  drivers/usb/core/otg_whitelist.h               |    2 ++
>  drivers/usb/core/port.c                        |    2 ++
>  drivers/usb/core/quirks.c                      |    2 ++
>  drivers/usb/core/usb-acpi.c                    |    2 ++
>  drivers/usb/dwc2/Makefile                      |    1 +
>  drivers/usb/dwc2/core.c                        |    2 ++
>  drivers/usb/dwc2/core.h                        |    2 ++
>  drivers/usb/dwc2/core_intr.c                   |    2 ++
>  drivers/usb/dwc2/debug.h                       |    2 ++
>  drivers/usb/dwc2/debugfs.c                     |    2 ++
>  drivers/usb/dwc2/gadget.c                      |    2 ++
>  drivers/usb/dwc2/hcd.c                         |    2 ++
>  drivers/usb/dwc2/hcd.h                         |    2 ++
>  drivers/usb/dwc2/hcd_ddma.c                    |    2 ++
>  drivers/usb/dwc2/hcd_intr.c                    |    2 ++
>  drivers/usb/dwc2/hcd_queue.c                   |    2 ++
>  drivers/usb/dwc2/hw.h                          |    2 ++
>  drivers/usb/dwc2/params.c                      |    2 ++
>  drivers/usb/dwc2/pci.c                         |    2 ++
>  drivers/usb/dwc2/platform.c                    |    2 ++
>  drivers/usb/dwc3/Makefile                      |    1 +
>  drivers/usb/dwc3/core.c                        |    2 ++
>  drivers/usb/dwc3/core.h                        |    2 ++
>  drivers/usb/dwc3/debug.h                       |    2 ++
>  drivers/usb/dwc3/debugfs.c                     |    2 ++
>  drivers/usb/dwc3/drd.c                         |    2 ++
>  drivers/usb/dwc3/dwc3-exynos.c                 |    2 ++
>  drivers/usb/dwc3/dwc3-keystone.c               |    2 ++
>  drivers/usb/dwc3/dwc3-of-simple.c              |    2 ++
>  drivers/usb/dwc3/dwc3-omap.c                   |    2 ++
>  drivers/usb/dwc3/dwc3-pci.c                    |    2 ++
>  drivers/usb/dwc3/dwc3-st.c                     |    2 ++
>  drivers/usb/dwc3/ep0.c                         |    2 ++
>  drivers/usb/dwc3/gadget.c                      |    2 ++
>  drivers/usb/dwc3/gadget.h                      |    2 ++
>  drivers/usb/dwc3/host.c                        |    2 ++
>  drivers/usb/dwc3/io.h                          |    2 ++
>  drivers/usb/dwc3/trace.c                       |    2 ++
>  drivers/usb/dwc3/trace.h                       |    2 ++
>  drivers/usb/dwc3/ulpi.c                        |    2 ++
>  drivers/usb/early/ehci-dbgp.c                  |    2 ++
>  drivers/usb/early/xhci-dbc.c                   |    2 ++
>  drivers/usb/early/xhci-dbc.h                   |    2 ++
>  drivers/usb/gadget/Makefile                    |    1 +
>  drivers/usb/gadget/composite.c                 |    2 ++
>  drivers/usb/gadget/config.c                    |    2 ++
>  drivers/usb/gadget/configfs.c                  |    1 +
>  drivers/usb/gadget/configfs.h                  |    1 +
>  drivers/usb/gadget/epautoconf.c                |    2 ++
>  drivers/usb/gadget/function/Makefile           |    1 +
>  drivers/usb/gadget/function/f_acm.c            |    2 ++
>  drivers/usb/gadget/function/f_ecm.c            |    2 ++
>  drivers/usb/gadget/function/f_eem.c            |    2 ++
>  drivers/usb/gadget/function/f_fs.c             |    2 ++
>  drivers/usb/gadget/function/f_hid.c            |    2 ++
>  drivers/usb/gadget/function/f_loopback.c       |    2 ++
>  drivers/usb/gadget/function/f_mass_storage.c   |    2 ++
>  drivers/usb/gadget/function/f_mass_storage.h   |    1 +
>  drivers/usb/gadget/function/f_midi.c           |    2 ++
>  drivers/usb/gadget/function/f_ncm.c            |    2 ++
>  drivers/usb/gadget/function/f_obex.c           |    2 ++
>  drivers/usb/gadget/function/f_phonet.c         |    2 ++
>  drivers/usb/gadget/function/f_printer.c        |    2 ++
>  drivers/usb/gadget/function/f_rndis.c          |    2 ++
>  drivers/usb/gadget/function/f_serial.c         |    2 ++
>  drivers/usb/gadget/function/f_sourcesink.c     |    2 ++
>  drivers/usb/gadget/function/f_subset.c         |    2 ++
>  drivers/usb/gadget/function/f_tcm.c            |    2 ++
>  drivers/usb/gadget/function/f_uac1.c           |    2 ++
>  drivers/usb/gadget/function/f_uac1_legacy.c    |    2 ++
>  drivers/usb/gadget/function/f_uac2.c           |    2 ++
>  drivers/usb/gadget/function/f_uvc.c            |    2 ++
>  drivers/usb/gadget/function/f_uvc.h            |    2 ++
>  drivers/usb/gadget/function/g_zero.h           |    2 ++
>  drivers/usb/gadget/function/rndis.c            |    2 ++
>  drivers/usb/gadget/function/rndis.h            |    2 ++
>  drivers/usb/gadget/function/storage_common.c   |    2 ++
>  drivers/usb/gadget/function/storage_common.h   |    1 +
>  drivers/usb/gadget/function/tcm.h              |    1 +
>  drivers/usb/gadget/function/u_audio.c          |    2 ++
>  drivers/usb/gadget/function/u_audio.h          |    2 ++
>  drivers/usb/gadget/function/u_ecm.h            |    2 ++
>  drivers/usb/gadget/function/u_eem.h            |    2 ++
>  drivers/usb/gadget/function/u_ether.c          |    2 ++
>  drivers/usb/gadget/function/u_ether.h          |    2 ++
>  drivers/usb/gadget/function/u_ether_configfs.h |    2 ++
>  drivers/usb/gadget/function/u_fs.h             |    2 ++
>  drivers/usb/gadget/function/u_gether.h         |    2 ++
>  drivers/usb/gadget/function/u_hid.h            |    2 ++
>  drivers/usb/gadget/function/u_midi.h           |    2 ++
>  drivers/usb/gadget/function/u_ncm.h            |    2 ++
>  drivers/usb/gadget/function/u_phonet.h         |    2 ++
>  drivers/usb/gadget/function/u_printer.h        |    2 ++
>  drivers/usb/gadget/function/u_rndis.h          |    2 ++
>  drivers/usb/gadget/function/u_serial.c         |    2 ++
>  drivers/usb/gadget/function/u_serial.h         |    2 ++
>  drivers/usb/gadget/function/u_tcm.h            |    2 ++
>  drivers/usb/gadget/function/u_uac1.h           |    2 ++
>  drivers/usb/gadget/function/u_uac1_legacy.c    |    2 ++
>  drivers/usb/gadget/function/u_uac1_legacy.h    |    2 ++
>  drivers/usb/gadget/function/u_uac2.h           |    2 ++
>  drivers/usb/gadget/function/u_uvc.h            |    2 ++
>  drivers/usb/gadget/function/uvc.h              |    2 ++
>  drivers/usb/gadget/function/uvc_configfs.c     |    2 ++
>  drivers/usb/gadget/function/uvc_configfs.h     |    2 ++
>  drivers/usb/gadget/function/uvc_queue.c        |    2 ++
>  drivers/usb/gadget/function/uvc_queue.h        |    1 +
>  drivers/usb/gadget/function/uvc_v4l2.c         |    2 ++
>  drivers/usb/gadget/function/uvc_v4l2.h         |    2 ++
>  drivers/usb/gadget/function/uvc_video.c        |    2 ++
>  drivers/usb/gadget/function/uvc_video.h        |    2 ++
>  drivers/usb/gadget/functions.c                 |    1 +
>  drivers/usb/gadget/legacy/Makefile             |    1 +
>  drivers/usb/gadget/legacy/acm_ms.c             |    2 ++
>  drivers/usb/gadget/legacy/audio.c              |    2 ++
>  drivers/usb/gadget/legacy/cdc2.c               |    2 ++
>  drivers/usb/gadget/legacy/dbgp.c               |    2 ++
>  drivers/usb/gadget/legacy/ether.c              |    2 ++
>  drivers/usb/gadget/legacy/g_ffs.c              |    2 ++
>  drivers/usb/gadget/legacy/gmidi.c              |    2 ++
>  drivers/usb/gadget/legacy/hid.c                |    2 ++
>  drivers/usb/gadget/legacy/inode.c              |    2 ++
>  drivers/usb/gadget/legacy/mass_storage.c       |    2 ++
>  drivers/usb/gadget/legacy/multi.c              |    2 ++
>  drivers/usb/gadget/legacy/ncm.c                |    2 ++
>  drivers/usb/gadget/legacy/nokia.c              |    2 ++
>  drivers/usb/gadget/legacy/printer.c            |    2 ++
>  drivers/usb/gadget/legacy/serial.c             |    2 ++
>  drivers/usb/gadget/legacy/tcm_usb_gadget.c     |    2 ++
>  drivers/usb/gadget/legacy/webcam.c             |    2 ++
>  drivers/usb/gadget/legacy/zero.c               |    2 ++
>  drivers/usb/gadget/u_f.c                       |    2 ++
>  drivers/usb/gadget/u_f.h                       |    2 ++
>  drivers/usb/gadget/u_os_desc.h                 |    2 ++
>  drivers/usb/gadget/udc/Makefile                |    1 +
>  drivers/usb/gadget/udc/amd5536udc.h            |    2 ++
>  drivers/usb/gadget/udc/amd5536udc_pci.c        |    2 ++
>  drivers/usb/gadget/udc/at91_udc.c              |    2 ++
>  drivers/usb/gadget/udc/at91_udc.h              |    2 ++
>  drivers/usb/gadget/udc/atmel_usba_udc.c        |    2 ++
>  drivers/usb/gadget/udc/atmel_usba_udc.h        |    2 ++
>  drivers/usb/gadget/udc/bcm63xx_udc.c           |    2 ++
>  drivers/usb/gadget/udc/bdc/Makefile            |    1 +
>  drivers/usb/gadget/udc/bdc/bdc.h               |    2 ++
>  drivers/usb/gadget/udc/bdc/bdc_cmd.c           |    2 ++
>  drivers/usb/gadget/udc/bdc/bdc_cmd.h           |    2 ++
>  drivers/usb/gadget/udc/bdc/bdc_core.c          |    2 ++
>  drivers/usb/gadget/udc/bdc/bdc_dbg.c           |    2 ++
>  drivers/usb/gadget/udc/bdc/bdc_dbg.h           |    2 ++
>  drivers/usb/gadget/udc/bdc/bdc_ep.c            |    2 ++
>  drivers/usb/gadget/udc/bdc/bdc_ep.h            |    2 ++
>  drivers/usb/gadget/udc/bdc/bdc_pci.c           |    2 ++
>  drivers/usb/gadget/udc/bdc/bdc_udc.c           |    2 ++
>  drivers/usb/gadget/udc/core.c                  |    2 ++
>  drivers/usb/gadget/udc/dummy_hcd.c             |    2 ++
>  drivers/usb/gadget/udc/fotg210-udc.c           |    2 ++
>  drivers/usb/gadget/udc/fotg210.h               |    2 ++
>  drivers/usb/gadget/udc/fsl_mxc_udc.c           |    2 ++
>  drivers/usb/gadget/udc/fsl_qe_udc.c            |    2 ++
>  drivers/usb/gadget/udc/fsl_qe_udc.h            |    2 ++
>  drivers/usb/gadget/udc/fsl_udc_core.c          |    2 ++
>  drivers/usb/gadget/udc/fsl_usb2_udc.h          |    2 ++
>  drivers/usb/gadget/udc/fusb300_udc.c           |    2 ++
>  drivers/usb/gadget/udc/fusb300_udc.h           |    2 ++
>  drivers/usb/gadget/udc/goku_udc.c              |    2 ++
>  drivers/usb/gadget/udc/goku_udc.h              |    2 ++
>  drivers/usb/gadget/udc/gr_udc.c                |    2 ++
>  drivers/usb/gadget/udc/gr_udc.h                |    2 ++
>  drivers/usb/gadget/udc/lpc32xx_udc.c           |    2 ++
>  drivers/usb/gadget/udc/m66592-udc.c            |    2 ++
>  drivers/usb/gadget/udc/m66592-udc.h            |    2 ++
>  drivers/usb/gadget/udc/mv_u3d.h                |    2 ++
>  drivers/usb/gadget/udc/mv_u3d_core.c           |    2 ++
>  drivers/usb/gadget/udc/mv_udc.h                |    2 ++
>  drivers/usb/gadget/udc/mv_udc_core.c           |    2 ++
>  drivers/usb/gadget/udc/net2272.c               |    2 ++
>  drivers/usb/gadget/udc/net2272.h               |    2 ++
>  drivers/usb/gadget/udc/net2280.c               |    2 ++
>  drivers/usb/gadget/udc/net2280.h               |    2 ++
>  drivers/usb/gadget/udc/omap_udc.c              |    2 ++
>  drivers/usb/gadget/udc/omap_udc.h              |    2 ++
>  drivers/usb/gadget/udc/pch_udc.c               |    2 ++
>  drivers/usb/gadget/udc/pxa25x_udc.c            |    2 ++
>  drivers/usb/gadget/udc/pxa25x_udc.h            |    2 ++
>  drivers/usb/gadget/udc/pxa27x_udc.c            |    2 ++
>  drivers/usb/gadget/udc/pxa27x_udc.h            |    2 ++
>  drivers/usb/gadget/udc/r8a66597-udc.c          |    2 ++
>  drivers/usb/gadget/udc/r8a66597-udc.h          |    2 ++
>  drivers/usb/gadget/udc/renesas_usb3.c          |    2 ++
>  drivers/usb/gadget/udc/s3c-hsudc.c             |    2 ++
>  drivers/usb/gadget/udc/s3c2410_udc.c           |    2 ++
>  drivers/usb/gadget/udc/s3c2410_udc.h           |    2 ++
>  drivers/usb/gadget/udc/snps_udc_core.c         |    2 ++
>  drivers/usb/gadget/udc/snps_udc_plat.c         |    2 ++
>  drivers/usb/gadget/udc/trace.c                 |    2 ++
>  drivers/usb/gadget/udc/trace.h                 |    2 ++
>  drivers/usb/gadget/udc/udc-xilinx.c            |    2 ++
>  drivers/usb/gadget/usbstring.c                 |    2 ++
>  drivers/usb/host/Makefile                      |    1 +
>  drivers/usb/host/bcma-hcd.c                    |    2 ++
>  drivers/usb/host/ehci-atmel.c                  |    2 ++
>  drivers/usb/host/ehci-dbg.c                    |    2 ++
>  drivers/usb/host/ehci-exynos.c                 |    2 ++
>  drivers/usb/host/ehci-fsl.c                    |    2 ++
>  drivers/usb/host/ehci-fsl.h                    |    2 ++
>  drivers/usb/host/ehci-grlib.c                  |    2 ++
>  drivers/usb/host/ehci-hcd.c                    |    2 ++
>  drivers/usb/host/ehci-hub.c                    |    2 ++
>  drivers/usb/host/ehci-mem.c                    |    2 ++
>  drivers/usb/host/ehci-msm.c                    |    2 ++
>  drivers/usb/host/ehci-mv.c                     |    2 ++
>  drivers/usb/host/ehci-mxc.c                    |    2 ++
>  drivers/usb/host/ehci-omap.c                   |    2 ++
>  drivers/usb/host/ehci-orion.c                  |    2 ++
>  drivers/usb/host/ehci-pci.c                    |    2 ++
>  drivers/usb/host/ehci-platform.c               |    2 ++
>  drivers/usb/host/ehci-pmcmsp.c                 |    2 ++
>  drivers/usb/host/ehci-ppc-of.c                 |    2 ++
>  drivers/usb/host/ehci-ps3.c                    |    2 ++
>  drivers/usb/host/ehci-q.c                      |    2 ++
>  drivers/usb/host/ehci-sched.c                  |    2 ++
>  drivers/usb/host/ehci-sh.c                     |    2 ++
>  drivers/usb/host/ehci-spear.c                  |    2 ++
>  drivers/usb/host/ehci-st.c                     |    2 ++
>  drivers/usb/host/ehci-sysfs.c                  |    2 ++
>  drivers/usb/host/ehci-tegra.c                  |    2 ++
>  drivers/usb/host/ehci-tilegx.c                 |    2 ++
>  drivers/usb/host/ehci-timer.c                  |    2 ++
>  drivers/usb/host/ehci-w90x900.c                |    2 ++
>  drivers/usb/host/ehci-xilinx-of.c              |    2 ++
>  drivers/usb/host/ehci.h                        |    2 ++
>  drivers/usb/host/fhci-dbg.c                    |    2 ++
>  drivers/usb/host/fhci-hcd.c                    |    2 ++
>  drivers/usb/host/fhci-hub.c                    |    2 ++
>  drivers/usb/host/fhci-mem.c                    |    2 ++
>  drivers/usb/host/fhci-q.c                      |    2 ++
>  drivers/usb/host/fhci-sched.c                  |    2 ++
>  drivers/usb/host/fhci-tds.c                    |    2 ++
>  drivers/usb/host/fhci.h                        |    2 ++
>  drivers/usb/host/fotg210-hcd.c                 |    2 ++
>  drivers/usb/host/fotg210.h                     |    1 +
>  drivers/usb/host/fsl-mph-dr-of.c               |    2 ++
>  drivers/usb/host/hwa-hc.c                      |    2 ++
>  drivers/usb/host/imx21-dbg.c                   |    2 ++
>  drivers/usb/host/imx21-hcd.c                   |    2 ++
>  drivers/usb/host/imx21-hcd.h                   |    2 ++
>  drivers/usb/host/isp116x-hcd.c                 |    2 ++
>  drivers/usb/host/isp116x.h                     |    2 ++
>  drivers/usb/host/isp1362-hcd.c                 |    2 ++
>  drivers/usb/host/isp1362.h                     |    2 ++
>  drivers/usb/host/max3421-hcd.c                 |    2 ++
>  drivers/usb/host/ohci-at91.c                   |    2 ++
>  drivers/usb/host/ohci-da8xx.c                  |    2 ++
>  drivers/usb/host/ohci-dbg.c                    |    2 ++
>  drivers/usb/host/ohci-exynos.c                 |    2 ++
>  drivers/usb/host/ohci-hcd.c                    |    2 ++
>  drivers/usb/host/ohci-hub.c                    |    2 ++
>  drivers/usb/host/ohci-mem.c                    |    2 ++
>  drivers/usb/host/ohci-nxp.c                    |    2 ++
>  drivers/usb/host/ohci-omap.c                   |    2 ++
>  drivers/usb/host/ohci-pci.c                    |    2 ++
>  drivers/usb/host/ohci-platform.c               |    2 ++
>  drivers/usb/host/ohci-ppc-of.c                 |    2 ++
>  drivers/usb/host/ohci-ps3.c                    |    2 ++
>  drivers/usb/host/ohci-pxa27x.c                 |    2 ++
>  drivers/usb/host/ohci-q.c                      |    2 ++
>  drivers/usb/host/ohci-s3c2410.c                |    2 ++
>  drivers/usb/host/ohci-sa1111.c                 |    2 ++
>  drivers/usb/host/ohci-sm501.c                  |    2 ++
>  drivers/usb/host/ohci-spear.c                  |    2 ++
>  drivers/usb/host/ohci-st.c                     |    2 ++
>  drivers/usb/host/ohci-tilegx.c                 |    2 ++
>  drivers/usb/host/ohci-tmio.c                   |    2 ++
>  drivers/usb/host/ohci.h                        |    2 ++
>  drivers/usb/host/oxu210hp-hcd.c                |    2 ++
>  drivers/usb/host/oxu210hp.h                    |    2 ++
>  drivers/usb/host/pci-quirks.c                  |    2 ++
>  drivers/usb/host/pci-quirks.h                  |    1 +
>  drivers/usb/host/r8a66597-hcd.c                |    2 ++
>  drivers/usb/host/r8a66597.h                    |    2 ++
>  drivers/usb/host/sl811-hcd.c                   |    2 ++
>  drivers/usb/host/sl811.h                       |    2 ++
>  drivers/usb/host/sl811_cs.c                    |    2 ++
>  drivers/usb/host/ssb-hcd.c                     |    2 ++
>  drivers/usb/host/u132-hcd.c                    |    2 ++
>  drivers/usb/host/uhci-debug.c                  |    2 ++
>  drivers/usb/host/uhci-grlib.c                  |    2 ++
>  drivers/usb/host/uhci-hcd.c                    |    2 ++
>  drivers/usb/host/uhci-hcd.h                    |    1 +
>  drivers/usb/host/uhci-hub.c                    |    2 ++
>  drivers/usb/host/uhci-pci.c                    |    2 ++
>  drivers/usb/host/uhci-platform.c               |    2 ++
>  drivers/usb/host/uhci-q.c                      |    2 ++
>  drivers/usb/host/whci/asl.c                    |    2 ++
>  drivers/usb/host/whci/debug.c                  |    2 ++
>  drivers/usb/host/whci/hcd.c                    |    2 ++
>  drivers/usb/host/whci/hw.c                     |    2 ++
>  drivers/usb/host/whci/init.c                   |    2 ++
>  drivers/usb/host/whci/int.c                    |    2 ++
>  drivers/usb/host/whci/pzl.c                    |    2 ++
>  drivers/usb/host/whci/qset.c                   |    2 ++
>  drivers/usb/host/whci/whcd.h                   |    2 ++
>  drivers/usb/host/whci/whci-hc.h                |    2 ++
>  drivers/usb/host/whci/wusb.c                   |    2 ++
>  drivers/usb/host/xhci-dbg.c                    |    2 ++
>  drivers/usb/host/xhci-ext-caps.h               |    2 ++
>  drivers/usb/host/xhci-hub.c                    |    2 ++
>  drivers/usb/host/xhci-mem.c                    |    2 ++
>  drivers/usb/host/xhci-mtk-sch.c                |    2 ++
>  drivers/usb/host/xhci-mtk.c                    |    2 ++
>  drivers/usb/host/xhci-mtk.h                    |    2 ++
>  drivers/usb/host/xhci-mvebu.c                  |    2 ++
>  drivers/usb/host/xhci-mvebu.h                  |    2 ++
>  drivers/usb/host/xhci-pci.c                    |    2 ++
>  drivers/usb/host/xhci-plat.c                   |    2 ++
>  drivers/usb/host/xhci-plat.h                   |    2 ++
>  drivers/usb/host/xhci-rcar.c                   |    2 ++
>  drivers/usb/host/xhci-rcar.h                   |    2 ++
>  drivers/usb/host/xhci-ring.c                   |    2 ++
>  drivers/usb/host/xhci-tegra.c                  |    2 ++
>  drivers/usb/host/xhci-trace.c                  |    2 ++
>  drivers/usb/host/xhci-trace.h                  |    2 ++
>  drivers/usb/host/xhci.c                        |    2 ++
>  drivers/usb/host/xhci.h                        |    2 ++
>  drivers/usb/image/mdc800.c                     |    2 ++
>  drivers/usb/image/microtek.c                   |    2 ++
>  drivers/usb/isp1760/isp1760-core.c             |    2 ++
>  drivers/usb/isp1760/isp1760-core.h             |    2 ++
>  drivers/usb/isp1760/isp1760-hcd.c              |    2 ++
>  drivers/usb/isp1760/isp1760-hcd.h              |    1 +
>  drivers/usb/isp1760/isp1760-if.c               |    2 ++
>  drivers/usb/isp1760/isp1760-regs.h             |    2 ++
>  drivers/usb/isp1760/isp1760-udc.c              |    2 ++
>  drivers/usb/isp1760/isp1760-udc.h              |    2 ++
>  drivers/usb/misc/Makefile                      |    1 +
>  drivers/usb/misc/adutux.c                      |    2 ++
>  drivers/usb/misc/appledisplay.c                |    2 ++
>  drivers/usb/misc/chaoskey.c                    |    2 ++
>  drivers/usb/misc/cypress_cy7c63.c              |    2 ++
>  drivers/usb/misc/cytherm.c                     |    2 ++
>  drivers/usb/misc/ehset.c                       |    2 ++
>  drivers/usb/misc/emi26.c                       |    2 ++
>  drivers/usb/misc/emi62.c                       |    2 ++
>  drivers/usb/misc/ezusb.c                       |    2 ++
>  drivers/usb/misc/ftdi-elan.c                   |    2 ++
>  drivers/usb/misc/idmouse.c                     |    2 ++
>  drivers/usb/misc/iowarrior.c                   |    2 ++
>  drivers/usb/misc/isight_firmware.c             |    2 ++
>  drivers/usb/misc/ldusb.c                       |    2 ++
>  drivers/usb/misc/legousbtower.c                |    2 ++
>  drivers/usb/misc/lvstest.c                     |    2 ++
>  drivers/usb/misc/rio500.c                      |    6 +++++-
>  drivers/usb/misc/rio500_usb.h                  |    1 +
>  drivers/usb/misc/sisusbvga/sisusb.c            |    2 ++
>  drivers/usb/misc/sisusbvga/sisusb.h            |    2 ++
>  drivers/usb/misc/sisusbvga/sisusb_con.c        |    2 ++
>  drivers/usb/misc/sisusbvga/sisusb_init.c       |    2 ++
>  drivers/usb/misc/sisusbvga/sisusb_init.h       |    6 +++++-
>  drivers/usb/misc/sisusbvga/sisusb_struct.h     |    2 ++
>  drivers/usb/misc/trancevibrator.c              |    2 ++
>  drivers/usb/misc/usb251xb.c                    |    2 ++
>  drivers/usb/misc/usb3503.c                     |    2 ++
>  drivers/usb/misc/usb4604.c                     |    2 ++
>  drivers/usb/misc/usb_u132.h                    |    2 ++
>  drivers/usb/misc/usblcd.c                      |    1 +
>  drivers/usb/misc/usbsevseg.c                   |    2 ++
>  drivers/usb/misc/usbtest.c                     |    1 +
>  drivers/usb/misc/uss720.c                      |    6 +++++-
>  drivers/usb/misc/yurex.c                       |    2 ++
>  drivers/usb/mon/mon_bin.c                      |    2 ++
>  drivers/usb/mon/mon_main.c                     |    2 ++
>  drivers/usb/mon/mon_stat.c                     |    2 ++
>  drivers/usb/mon/mon_text.c                     |    2 ++
>  drivers/usb/mon/usb_mon.h                      |    2 ++
>  drivers/usb/mtu3/Makefile                      |    1 +
>  drivers/usb/mtu3/mtu3.h                        |    2 ++
>  drivers/usb/mtu3/mtu3_core.c                   |    2 ++
>  drivers/usb/mtu3/mtu3_dr.c                     |    2 ++
>  drivers/usb/mtu3/mtu3_dr.h                     |    2 ++
>  drivers/usb/mtu3/mtu3_gadget.c                 |    2 ++
>  drivers/usb/mtu3/mtu3_gadget_ep0.c             |    2 ++
>  drivers/usb/mtu3/mtu3_host.c                   |    2 ++
>  drivers/usb/mtu3/mtu3_hw_regs.h                |    2 ++
>  drivers/usb/mtu3/mtu3_plat.c                   |    2 ++
>  drivers/usb/mtu3/mtu3_qmu.c                    |    2 ++
>  drivers/usb/mtu3/mtu3_qmu.h                    |    2 ++
>  drivers/usb/musb/Makefile                      |    1 +
>  drivers/usb/musb/am35x.c                       |    2 ++
>  drivers/usb/musb/blackfin.c                    |    2 ++
>  drivers/usb/musb/blackfin.h                    |    2 ++
>  drivers/usb/musb/cppi_dma.c                    |    2 ++
>  drivers/usb/musb/cppi_dma.h                    |    6 +++++-
>  drivers/usb/musb/da8xx.c                       |    2 ++
>  drivers/usb/musb/davinci.c                     |    2 ++
>  drivers/usb/musb/davinci.h                     |    2 ++
>  drivers/usb/musb/jz4740.c                      |    2 ++
>  drivers/usb/musb/musb_am335x.c                 |    1 +
>  drivers/usb/musb/musb_core.c                   |    2 ++
>  drivers/usb/musb/musb_core.h                   |    2 ++
>  drivers/usb/musb/musb_cppi41.c                 |    1 +
>  drivers/usb/musb/musb_debug.h                  |    2 ++
>  drivers/usb/musb/musb_debugfs.c                |    2 ++
>  drivers/usb/musb/musb_dma.h                    |    2 ++
>  drivers/usb/musb/musb_dsps.c                   |    2 ++
>  drivers/usb/musb/musb_gadget.c                 |    2 ++
>  drivers/usb/musb/musb_gadget.h                 |    2 ++
>  drivers/usb/musb/musb_gadget_ep0.c             |    2 ++
>  drivers/usb/musb/musb_host.c                   |    2 ++
>  drivers/usb/musb/musb_host.h                   |    2 ++
>  drivers/usb/musb/musb_io.h                     |    2 ++
>  drivers/usb/musb/musb_regs.h                   |    2 ++
>  drivers/usb/musb/musb_trace.c                  |    2 ++
>  drivers/usb/musb/musb_trace.h                  |    2 ++
>  drivers/usb/musb/musb_virthub.c                |    2 ++
>  drivers/usb/musb/musbhsdma.c                   |    2 ++
>  drivers/usb/musb/musbhsdma.h                   |    2 ++
>  drivers/usb/musb/omap2430.c                    |    2 ++
>  drivers/usb/musb/omap2430.h                    |    2 ++
>  drivers/usb/musb/sunxi.c                       |    2 ++
>  drivers/usb/musb/tusb6010.c                    |    2 ++
>  drivers/usb/musb/tusb6010.h                    |    2 ++
>  drivers/usb/musb/tusb6010_omap.c               |    2 ++
>  drivers/usb/musb/ux500.c                       |    2 ++
>  drivers/usb/musb/ux500_dma.c                   |    2 ++
>  drivers/usb/phy/Makefile                       |    1 +
>  drivers/usb/phy/of.c                           |    2 ++
>  drivers/usb/phy/phy-ab8500-usb.c               |    2 ++
>  drivers/usb/phy/phy-am335x-control.c           |    1 +
>  drivers/usb/phy/phy-am335x-control.h           |    1 +
>  drivers/usb/phy/phy-am335x.c                   |    1 +
>  drivers/usb/phy/phy-fsl-usb.c                  |    2 ++
>  drivers/usb/phy/phy-fsl-usb.h                  |    2 ++
>  drivers/usb/phy/phy-generic.c                  |    2 ++
>  drivers/usb/phy/phy-generic.h                  |    1 +
>  drivers/usb/phy/phy-gpio-vbus-usb.c            |    2 ++
>  drivers/usb/phy/phy-isp1301-omap.c             |    2 ++
>  drivers/usb/phy/phy-isp1301.c                  |    2 ++
>  drivers/usb/phy/phy-keystone.c                 |    2 ++
>  drivers/usb/phy/phy-msm-usb.c                  |    2 ++
>  drivers/usb/phy/phy-mv-usb.c                   |    2 ++
>  drivers/usb/phy/phy-mv-usb.h                   |    2 ++
>  drivers/usb/phy/phy-mxs-usb.c                  |    2 ++
>  drivers/usb/phy/phy-omap-otg.c                 |    2 ++
>  drivers/usb/phy/phy-qcom-8x16-usb.c            |    2 ++
>  drivers/usb/phy/phy-tahvo.c                    |    2 ++
>  drivers/usb/phy/phy-tegra-usb.c                |    2 ++
>  drivers/usb/phy/phy-twl6030-usb.c              |    2 ++
>  drivers/usb/phy/phy-ulpi-viewport.c            |    2 ++
>  drivers/usb/phy/phy-ulpi.c                     |    2 ++
>  drivers/usb/phy/phy.c                          |    2 ++
>  drivers/usb/renesas_usbhs/Makefile             |    1 +
>  drivers/usb/renesas_usbhs/common.c             |    2 ++
>  drivers/usb/renesas_usbhs/common.h             |    2 ++
>  drivers/usb/renesas_usbhs/fifo.c               |    2 ++
>  drivers/usb/renesas_usbhs/fifo.h               |    2 ++
>  drivers/usb/renesas_usbhs/mod.c                |    2 ++
>  drivers/usb/renesas_usbhs/mod.h                |    2 ++
>  drivers/usb/renesas_usbhs/mod_gadget.c         |    2 ++
>  drivers/usb/renesas_usbhs/mod_host.c           |    2 ++
>  drivers/usb/renesas_usbhs/pipe.c               |    2 ++
>  drivers/usb/renesas_usbhs/pipe.h               |    2 ++
>  drivers/usb/renesas_usbhs/rcar2.c              |    2 ++
>  drivers/usb/renesas_usbhs/rcar3.c              |    2 ++
>  drivers/usb/serial/Makefile                    |    1 +
>  drivers/usb/serial/aircable.c                  |    2 ++
>  drivers/usb/serial/ark3116.c                   |    2 ++
>  drivers/usb/serial/belkin_sa.c                 |    2 ++
>  drivers/usb/serial/belkin_sa.h                 |    2 ++
>  drivers/usb/serial/bus.c                       |    2 ++
>  drivers/usb/serial/ch341.c                     |    2 ++
>  drivers/usb/serial/console.c                   |    2 ++
>  drivers/usb/serial/cp210x.c                    |    2 ++
>  drivers/usb/serial/cyberjack.c                 |    2 ++
>  drivers/usb/serial/cypress_m8.c                |    2 ++
>  drivers/usb/serial/cypress_m8.h                |    1 +
>  drivers/usb/serial/digi_acceleport.c           |    2 ++
>  drivers/usb/serial/empeg.c                     |    2 ++
>  drivers/usb/serial/f81232.c                    |    2 ++
>  drivers/usb/serial/f81534.c                    |    2 ++
>  drivers/usb/serial/ftdi_sio.c                  |    2 ++
>  drivers/usb/serial/ftdi_sio.h                  |    2 ++
>  drivers/usb/serial/ftdi_sio_ids.h              |    2 ++
>  drivers/usb/serial/garmin_gps.c                |    2 ++
>  drivers/usb/serial/generic.c                   |    2 ++
>  drivers/usb/serial/io_16654.h                  |    1 +
>  drivers/usb/serial/io_edgeport.c               |    2 ++
>  drivers/usb/serial/io_edgeport.h               |    1 +
>  drivers/usb/serial/io_ionsp.h                  |    1 +
>  drivers/usb/serial/io_ti.c                     |    2 ++
>  drivers/usb/serial/io_ti.h                     |    1 +
>  drivers/usb/serial/io_usbvend.h                |    1 +
>  drivers/usb/serial/ipaq.c                      |    2 ++
>  drivers/usb/serial/ipw.c                       |    2 ++
>  drivers/usb/serial/ir-usb.c                    |    2 ++
>  drivers/usb/serial/iuu_phoenix.c               |    2 ++
>  drivers/usb/serial/iuu_phoenix.h               |    2 ++
>  drivers/usb/serial/keyspan.c                   |    2 ++
>  drivers/usb/serial/keyspan_pda.c               |    2 ++
>  drivers/usb/serial/kl5kusb105.c                |    2 ++
>  drivers/usb/serial/kl5kusb105.h                |    2 ++
>  drivers/usb/serial/kobil_sct.c                 |    2 ++
>  drivers/usb/serial/kobil_sct.h                 |    6 +++++-
>  drivers/usb/serial/mct_u232.c                  |    2 ++
>  drivers/usb/serial/mct_u232.h                  |    2 ++
>  drivers/usb/serial/metro-usb.c                 |    2 ++
>  drivers/usb/serial/mos7720.c                   |    2 ++
>  drivers/usb/serial/mos7840.c                   |    2 ++
>  drivers/usb/serial/mxuport.c                   |    2 ++
>  drivers/usb/serial/navman.c                    |    2 ++
>  drivers/usb/serial/omninet.c                   |    2 ++
>  drivers/usb/serial/opticon.c                   |    2 ++
>  drivers/usb/serial/option.c                    |    2 ++
>  drivers/usb/serial/oti6858.c                   |    2 ++
>  drivers/usb/serial/oti6858.h                   |    2 ++
>  drivers/usb/serial/pl2303.c                    |    2 ++
>  drivers/usb/serial/pl2303.h                    |    2 ++
>  drivers/usb/serial/qcaux.c                     |    2 ++
>  drivers/usb/serial/qcserial.c                  |    2 ++
>  drivers/usb/serial/quatech2.c                  |    2 ++
>  drivers/usb/serial/safe_serial.c               |    2 ++
>  drivers/usb/serial/sierra.c                    |    2 ++
>  drivers/usb/serial/spcp8x5.c                   |    2 ++
>  drivers/usb/serial/ssu100.c                    |    2 ++
>  drivers/usb/serial/symbolserial.c              |    2 ++
>  drivers/usb/serial/ti_usb_3410_5052.c          |    2 ++
>  drivers/usb/serial/upd78f0730.c                |    2 ++
>  drivers/usb/serial/usb-serial-simple.c         |    2 ++
>  drivers/usb/serial/usb-serial.c                |    2 ++
>  drivers/usb/serial/usb-wwan.h                  |    2 ++
>  drivers/usb/serial/usb_debug.c                 |    2 ++
>  drivers/usb/serial/usb_wwan.c                  |    2 ++
>  drivers/usb/serial/visor.c                     |    2 ++
>  drivers/usb/serial/visor.h                     |    2 ++
>  drivers/usb/serial/whiteheat.c                 |    2 ++
>  drivers/usb/serial/whiteheat.h                 |    2 ++
>  drivers/usb/serial/wishbone-serial.c           |    2 ++
>  drivers/usb/serial/xsens_mt.c                  |    2 ++
>  drivers/usb/storage/Makefile                   |    1 +
>  drivers/usb/storage/alauda.c                   |    2 ++
>  drivers/usb/storage/cypress_atacb.c            |    2 ++
>  drivers/usb/storage/datafab.c                  |    2 ++
>  drivers/usb/storage/debug.c                    |    2 ++
>  drivers/usb/storage/debug.h                    |    2 ++
>  drivers/usb/storage/ene_ub6250.c               |    2 ++
>  drivers/usb/storage/freecom.c                  |    2 ++
>  drivers/usb/storage/initializers.c             |    2 ++
>  drivers/usb/storage/initializers.h             |    2 ++
>  drivers/usb/storage/isd200.c                   |    2 ++
>  drivers/usb/storage/jumpshot.c                 |    2 ++
>  drivers/usb/storage/karma.c                    |    2 ++
>  drivers/usb/storage/onetouch.c                 |    2 ++
>  drivers/usb/storage/option_ms.c                |    2 ++
>  drivers/usb/storage/option_ms.h                |    1 +
>  drivers/usb/storage/protocol.c                 |    2 ++
>  drivers/usb/storage/protocol.h                 |    2 ++
>  drivers/usb/storage/realtek_cr.c               |    2 ++
>  drivers/usb/storage/scsiglue.c                 |    2 ++
>  drivers/usb/storage/scsiglue.h                 |    2 ++
>  drivers/usb/storage/sddr09.c                   |    2 ++
>  drivers/usb/storage/sddr55.c                   |    2 ++
>  drivers/usb/storage/shuttle_usbat.c            |    2 ++
>  drivers/usb/storage/sierra_ms.c                |    1 +
>  drivers/usb/storage/sierra_ms.h                |    1 +
>  drivers/usb/storage/transport.c                |    2 ++
>  drivers/usb/storage/transport.h                |    2 ++
>  drivers/usb/storage/uas-detect.h               |    1 +
>  drivers/usb/storage/uas.c                      |    2 ++
>  drivers/usb/storage/unusual_alauda.h           |    2 ++
>  drivers/usb/storage/unusual_cypress.h          |    2 ++
>  drivers/usb/storage/unusual_datafab.h          |    2 ++
>  drivers/usb/storage/unusual_devs.h             |    2 ++
>  drivers/usb/storage/unusual_ene_ub6250.h       |    2 ++
>  drivers/usb/storage/unusual_freecom.h          |    2 ++
>  drivers/usb/storage/unusual_isd200.h           |    2 ++
>  drivers/usb/storage/unusual_jumpshot.h         |    2 ++
>  drivers/usb/storage/unusual_karma.h            |    2 ++
>  drivers/usb/storage/unusual_onetouch.h         |    2 ++
>  drivers/usb/storage/unusual_realtek.h          |    2 ++
>  drivers/usb/storage/unusual_sddr09.h           |    2 ++
>  drivers/usb/storage/unusual_sddr55.h           |    2 ++
>  drivers/usb/storage/unusual_uas.h              |    2 ++
>  drivers/usb/storage/unusual_usbat.h            |    2 ++
>  drivers/usb/storage/usb.c                      |    2 ++
>  drivers/usb/storage/usb.h                      |    2 ++
>  drivers/usb/storage/usual-tables.c             |    2 ++
>  drivers/usb/typec/typec.c                      |    2 ++
>  drivers/usb/typec/typec_wcove.c                |    2 ++
>  drivers/usb/typec/ucsi/Makefile                |    1 +
>  drivers/usb/typec/ucsi/debug.h                 |    1 +
>  drivers/usb/typec/ucsi/trace.h                 |    1 +
>  drivers/usb/typec/ucsi/ucsi.c                  |    2 ++
>  drivers/usb/typec/ucsi/ucsi.h                  |    1 +
>  drivers/usb/typec/ucsi/ucsi_acpi.c             |    2 ++
>  drivers/usb/usb-skeleton.c                     |    2 ++
>  drivers/usb/usbip/Makefile                     |    1 +
>  drivers/usb/usbip/stub.h                       |    2 ++
>  drivers/usb/usbip/stub_dev.c                   |    2 ++
>  drivers/usb/usbip/stub_main.c                  |    2 ++
>  drivers/usb/usbip/stub_rx.c                    |    2 ++
>  drivers/usb/usbip/stub_tx.c                    |    2 ++
>  drivers/usb/usbip/usbip_common.c               |    2 ++
>  drivers/usb/usbip/usbip_common.h               |    2 ++
>  drivers/usb/usbip/usbip_event.c                |    2 ++
>  drivers/usb/usbip/vhci.h                       |    2 ++
>  drivers/usb/usbip/vhci_hcd.c                   |    2 ++
>  drivers/usb/usbip/vhci_rx.c                    |    2 ++
>  drivers/usb/usbip/vhci_sysfs.c                 |    2 ++
>  drivers/usb/usbip/vhci_tx.c                    |    2 ++
>  drivers/usb/usbip/vudc.h                       |    2 ++
>  drivers/usb/usbip/vudc_dev.c                   |    2 ++
>  drivers/usb/usbip/vudc_main.c                  |    2 ++
>  drivers/usb/usbip/vudc_rx.c                    |    2 ++
>  drivers/usb/usbip/vudc_sysfs.c                 |    2 ++
>  drivers/usb/usbip/vudc_transfer.c              |    2 ++
>  drivers/usb/usbip/vudc_tx.c                    |    2 ++
>  drivers/usb/wusbcore/Makefile                  |    1 +
>  drivers/usb/wusbcore/cbaf.c                    |    2 ++
>  drivers/usb/wusbcore/crypto.c                  |    2 ++
>  drivers/usb/wusbcore/dev-sysfs.c               |    2 ++
>  drivers/usb/wusbcore/devconnect.c              |    2 ++
>  drivers/usb/wusbcore/mmc.c                     |    2 ++
>  drivers/usb/wusbcore/pal.c                     |    2 ++
>  drivers/usb/wusbcore/reservation.c             |    2 ++
>  drivers/usb/wusbcore/rh.c                      |    2 ++
>  drivers/usb/wusbcore/security.c                |    2 ++
>  drivers/usb/wusbcore/wa-hc.c                   |    2 ++
>  drivers/usb/wusbcore/wa-hc.h                   |    2 ++
>  drivers/usb/wusbcore/wa-nep.c                  |    2 ++
>  drivers/usb/wusbcore/wa-rpipe.c                |    2 ++
>  drivers/usb/wusbcore/wa-xfer.c                 |    2 ++
>  drivers/usb/wusbcore/wusbhc.c                  |    2 ++
>  drivers/usb/wusbcore/wusbhc.h                  |    2 ++
>  685 files changed, 1325 insertions(+), 6 deletions(-)

ouch :-)

For the stuff which concerns me:

Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Rob Herring - Oct. 20, 2017, 3:26 p.m.
On Thu, Oct 19, 2017 at 3:38 AM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> It's good to have SPDX identifiers in all files to make it easier to
> audit the kernel tree for correct licenses.  This patch adds these
> identifiers to all files in drivers/usb/ based on a script and data from
> Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Kate Stewart <kstewart@linuxfoundation.org>
> Cc: Philippe Ombredanne <pombredanne@nexb.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> Unless someone really complains, I'm going to add this to my tree for
> 4.15-rc1.

Glad to see this. I've been suggesting folks use SPDX tags on dts
files as those are often dual licensed, so we have lots of license
boilerplate. But I've had some push back[1] but it's not something I
care to spend cycles on. It would be good to have some statement on
the use of tags. Anything new should use them (I can dust off my
checkpatch.pl check for this)? This is a good task for newbies? It's
each maintainer's decision? It's the copyright holder's (and their
lawyer's) decision?

Rob

[1] https://lkml.org/lkml/2017/2/28/750
gregkh@linuxfoundation.org - Oct. 21, 2017, 7:48 a.m.
On Fri, Oct 20, 2017 at 10:26:22AM -0500, Rob Herring wrote:
> On Thu, Oct 19, 2017 at 3:38 AM, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> > It's good to have SPDX identifiers in all files to make it easier to
> > audit the kernel tree for correct licenses.  This patch adds these
> > identifiers to all files in drivers/usb/ based on a script and data from
> > Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
> >
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Kate Stewart <kstewart@linuxfoundation.org>
> > Cc: Philippe Ombredanne <pombredanne@nexb.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> > Unless someone really complains, I'm going to add this to my tree for
> > 4.15-rc1.
> 
> Glad to see this. I've been suggesting folks use SPDX tags on dts
> files as those are often dual licensed, so we have lots of license
> boilerplate. But I've had some push back[1] but it's not something I
> care to spend cycles on. It would be good to have some statement on
> the use of tags. Anything new should use them (I can dust off my
> checkpatch.pl check for this)? This is a good task for newbies? It's
> each maintainer's decision? It's the copyright holder's (and their
> lawyer's) decision?

As for what type of a task this is, we have a script and a huge database
that has been worked on by some people to make a lot of this pretty
"automatic" to apply.

For the "odd" issues that Russell is worried about, those we can take as
a case-by-case basis after we get through all of the obvious ones first.

Thomas and I are going to talk about this next week in Prague to see if
we can come up with a plan...

thanks,

greg k-h
Philippe Ombredanne - Oct. 24, 2017, 10:36 a.m.
Rob:

On Sat, Oct 21, 2017 at 9:48 AM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> On Fri, Oct 20, 2017 at 10:26:22AM -0500, Rob Herring wrote:
>> On Thu, Oct 19, 2017 at 3:38 AM, Greg Kroah-Hartman
>> <gregkh@linuxfoundation.org> wrote:
>> > It's good to have SPDX identifiers in all files to make it easier to
>> > audit the kernel tree for correct licenses.  This patch adds these
>> > identifiers to all files in drivers/usb/ based on a script and data from
>> > Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
>> >
>> > Cc: Thomas Gleixner <tglx@linutronix.de>
>> > Cc: Kate Stewart <kstewart@linuxfoundation.org>
>> > Cc: Philippe Ombredanne <pombredanne@nexb.com>
>> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> > ---
>> > Unless someone really complains, I'm going to add this to my tree for
>> > 4.15-rc1.
>>
>> Glad to see this. I've been suggesting folks use SPDX tags on dts
>> files as those are often dual licensed, so we have lots of license
>> boilerplate. But I've had some push back[1] but it's not something I
>> care to spend cycles on. It would be good to have some statement on
>> the use of tags. Anything new should use them (I can dust off my
>> checkpatch.pl check for this)? This is a good task for newbies? It's
>> each maintainer's decision? It's the copyright holder's (and their
>> lawyer's) decision?
>
> As for what type of a task this is, we have a script and a huge database
> that has been worked on by some people to make a lot of this pretty
> "automatic" to apply.

I am one of the people that worked on scanning kernels for licenses
using my scancode tool [1] to help there.

Regarding checkpatch.pl and tooling to help review patches I can think of
two things:

1. when there is SPDX identifier in a patch, it could be checked for validity
I have a library for this [2] (this is in Python not Perl) but the checks needed
should be fairly trivial since there is not an open number of license
variations in the kernel: this could be re-written in Perl alright.

2. scancode can detect the licenses fairly accurately to spit and suggest
an SPDX license identifier and/or provide input to remove boilerplate either
for new patches or existing code. Not sure how to best integrate this as a
patch check step. Docs? Server-side tool? Any idea?

What would be the best thing to do next?

[1] https://github.com/nexB/scancode-toolkit
[2] https://github.com/nexB/license-expression/

Patch

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 9650b351c26c..cb8d902b801d 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -1,6 +1,7 @@ 
 #
 # Makefile for the kernel USB device drivers.
 #
+# SPDX-License-Identifier: GPL-2.0
 
 # Object files in subdirectories
 
diff --git a/drivers/usb/atm/Makefile b/drivers/usb/atm/Makefile
index ac278946b06c..45450605c742 100644
--- a/drivers/usb/atm/Makefile
+++ b/drivers/usb/atm/Makefile
@@ -1,6 +1,7 @@ 
 #
 # Makefile for USB ATM/xDSL drivers
 #
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_CXACRU)	+= cxacru.o
 obj-$(CONFIG_USB_SPEEDTOUCH)	+= speedtch.o
 obj-$(CONFIG_USB_UEAGLEATM)	+= ueagle-atm.o
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 600a670b4feb..d4749cb10044 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -21,6 +21,7 @@ 
  *  this program; if not, write to the Free Software Foundation, Inc., 59
  *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ******************************************************************************/
 
 /*
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 091db9b281f5..426205903ab3 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -21,6 +21,7 @@ 
  *  this program; if not, write to the Free Software Foundation, Inc., 59
  *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ******************************************************************************/
 
 #include <asm/page.h>
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index ba7616395db2..3387909605bc 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -53,6 +53,8 @@ 
  * Damien Bergamini agree to put his code under a DUAL GPL/BSD license.
  *
  * The rest of the code was was rewritten from scratch.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 8607af758bbd..1bd124403e8d 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -19,6 +19,7 @@ 
  *  this program; if not, write to the Free Software Foundation, Inc., 59
  *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ******************************************************************************/
 
 /*
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index f3eecd967a8a..9cf0597335fc 100644
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -19,6 +19,7 @@ 
  *  this program; if not, write to the Free Software Foundation, Inc., 59
  *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ******************************************************************************/
 
 #ifndef	_USBATM_H_
diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
index c73c1ec3005e..838479309f4f 100644
--- a/drivers/usb/atm/xusbatm.c
+++ b/drivers/usb/atm/xusbatm.c
@@ -17,6 +17,7 @@ 
  *  this program; if not, write to the Free Software Foundation, Inc., 59
  *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ******************************************************************************/
 
 #include <linux/module.h>
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index 5796c8820514..4640df2931b6 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -19,6 +19,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301  USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/c67x00/c67x00-hcd.c b/drivers/usb/c67x00/c67x00-hcd.c
index 30d3f346686e..c5ef2c6b0400 100644
--- a/drivers/usb/c67x00/c67x00-hcd.c
+++ b/drivers/usb/c67x00/c67x00-hcd.c
@@ -19,6 +19,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301  USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/c67x00/c67x00-hcd.h b/drivers/usb/c67x00/c67x00-hcd.h
index cf8a455a6403..0cdf8fd2cd4a 100644
--- a/drivers/usb/c67x00/c67x00-hcd.h
+++ b/drivers/usb/c67x00/c67x00-hcd.h
@@ -19,6 +19,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301  USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef _USB_C67X00_HCD_H
diff --git a/drivers/usb/c67x00/c67x00-ll-hpi.c b/drivers/usb/c67x00/c67x00-ll-hpi.c
index b58151841e10..0cca241601fd 100644
--- a/drivers/usb/c67x00/c67x00-ll-hpi.c
+++ b/drivers/usb/c67x00/c67x00-ll-hpi.c
@@ -19,6 +19,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301  USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <asm/byteorder.h>
diff --git a/drivers/usb/c67x00/c67x00-sched.c b/drivers/usb/c67x00/c67x00-sched.c
index 7311ed61e99a..a0f92d423287 100644
--- a/drivers/usb/c67x00/c67x00-sched.c
+++ b/drivers/usb/c67x00/c67x00-sched.c
@@ -19,6 +19,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301  USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/c67x00/c67x00.h b/drivers/usb/c67x00/c67x00.h
index a26e9ded0f32..ddec55be8361 100644
--- a/drivers/usb/c67x00/c67x00.h
+++ b/drivers/usb/c67x00/c67x00.h
@@ -19,6 +19,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301  USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef _USB_C67X00_H
diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
index ddcbddf8361a..e3d5e728fa53 100644
--- a/drivers/usb/chipidea/Makefile
+++ b/drivers/usb/chipidea/Makefile
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_CHIPIDEA)		+= ci_hdrc.o
 
 ci_hdrc-y				:= core.o otg.o debug.o
diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h
index e462f55c8b99..3bed6d6b1d9d 100644
--- a/drivers/usb/chipidea/bits.h
+++ b/drivers/usb/chipidea/bits.h
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_BITS_H
diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
index 6743f85b1b7a..c847ea3a1408 100644
--- a/drivers/usb/chipidea/ci.h
+++ b/drivers/usb/chipidea/ci.h
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_CI_H
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 5f4a8157fad8..ecd744222d11 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -9,6 +9,8 @@ 
  *
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.h b/drivers/usb/chipidea/ci_hdrc_imx.h
index d666c9f036ba..64a0d8ae0a9c 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.h
+++ b/drivers/usb/chipidea/ci_hdrc_imx.h
@@ -7,6 +7,8 @@ 
  *
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __DRIVER_USB_CHIPIDEA_CI_HDRC_IMX_H
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
index bb626120296f..0f393c64ffca 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -3,6 +3,8 @@ 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
  * only version 2 as published by the Free Software Foundation.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/chipidea/ci_hdrc_pci.c b/drivers/usb/chipidea/ci_hdrc_pci.c
index 39414e4b2d81..390ed1e54244 100644
--- a/drivers/usb/chipidea/ci_hdrc_pci.c
+++ b/drivers/usb/chipidea/ci_hdrc_pci.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/platform_device.h>
diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c b/drivers/usb/chipidea/ci_hdrc_usb2.c
index 99425db9ba62..caf2f6454f30 100644
--- a/drivers/usb/chipidea/ci_hdrc_usb2.c
+++ b/drivers/usb/chipidea/ci_hdrc_usb2.c
@@ -6,6 +6,8 @@ 
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/chipidea/ci_hdrc_zevio.c b/drivers/usb/chipidea/ci_hdrc_zevio.c
index 1264de505527..4279a6ec5171 100644
--- a/drivers/usb/chipidea/ci_hdrc_zevio.c
+++ b/drivers/usb/chipidea/ci_hdrc_zevio.c
@@ -7,6 +7,8 @@ 
  *
  * Based off drivers/usb/chipidea/ci_hdrc_msm.c
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 43ea5fb87b9a..02ad2f6663c3 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
index 1c31e8a08810..8ca38d4aa68f 100644
--- a/drivers/usb/chipidea/debug.c
+++ b/drivers/usb/chipidea/debug.c
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/types.h>
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 18cb8e46262d..f7a29c9d8d83 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -17,6 +17,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/chipidea/host.h b/drivers/usb/chipidea/host.h
index 0f12f131bdd3..1bf902912195 100644
--- a/drivers/usb/chipidea/host.h
+++ b/drivers/usb/chipidea/host.h
@@ -1,5 +1,6 @@ 
 #ifndef __DRIVERS_USB_CHIPIDEA_HOST_H
 #define __DRIVERS_USB_CHIPIDEA_HOST_H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifdef CONFIG_USB_CHIPIDEA_HOST
 
diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c
index 10236fe71522..c9bd4e193366 100644
--- a/drivers/usb/chipidea/otg.c
+++ b/drivers/usb/chipidea/otg.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/chipidea/otg.h b/drivers/usb/chipidea/otg.h
index 9ecb598e48f0..14eeb6c1cf82 100644
--- a/drivers/usb/chipidea/otg.h
+++ b/drivers/usb/chipidea/otg.h
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_OTG_H
diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
index 5ea0246f650d..923f3b80e842 100644
--- a/drivers/usb/chipidea/otg_fsm.c
+++ b/drivers/usb/chipidea/otg_fsm.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h
index 6366fe398ba6..b23efd062904 100644
--- a/drivers/usb/chipidea/otg_fsm.h
+++ b/drivers/usb/chipidea/otg_fsm.h
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_OTG_FSM_H
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index fe8a90543ea3..45c2b9911428 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/delay.h>
diff --git a/drivers/usb/chipidea/udc.h b/drivers/usb/chipidea/udc.h
index 2ecd1174d66c..3d5ecb466236 100644
--- a/drivers/usb/chipidea/udc.h
+++ b/drivers/usb/chipidea/udc.h
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __DRIVERS_USB_CHIPIDEA_UDC_H
diff --git a/drivers/usb/chipidea/ulpi.c b/drivers/usb/chipidea/ulpi.c
index 1219583dc1b2..15fd98f077d2 100644
--- a/drivers/usb/chipidea/ulpi.c
+++ b/drivers/usb/chipidea/ulpi.c
@@ -9,6 +9,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 9f4a0185dd60..dcc35aabbaff 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -7,6 +7,8 @@ 
  *
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 5e056064259c..e9eb4a71bde4 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -26,6 +26,8 @@ 
  * 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
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #undef DEBUG
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 7a2b3deafc90..1ef2f3aec2c8 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -4,6 +4,8 @@ 
  *
  * Mainly take from usbnet's cdc-ether part
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 3e865dbf878c..03d5d888f35a 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -10,6 +10,8 @@ 
  * Released under the GPLv2.
  *
  * Many thanks to Carl Nordbeck
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index fb87c17ed6fa..a928f578edbf 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -29,6 +29,8 @@ 
  *	v0.13 - alloc space for statusbuf (<status> not on stack);
  *		use usb_alloc_coherent() for read buf & write buf;
  *      none  - Maintained in Linux kernel after v0.13
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 6ebfabfa0dc7..000cd5fca5df 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -17,6 +17,8 @@ 
  *
  * The GNU General Public License is available at
  * http://www.gnu.org/copyleft/gpl.html.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile
index 6bbb3ec17018..ba964324dac4 100644
--- a/drivers/usb/common/Makefile
+++ b/drivers/usb/common/Makefile
@@ -1,6 +1,7 @@ 
 #
 # Makefile for the usb common parts.
 #
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_USB_COMMON)	  += usb-common.o
 usb-common-y			  += common.o
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index 552ff7ac5a6b..debc0dface5d 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -9,6 +9,8 @@ 
  * (ie. CONFIG_USB_GADGET=y) is compiled in the kernel, this module is
  * compiled-in as well.  Otherwise, if either of the two stacks is
  * compiled as module, this file is compiled as module as well.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/common/led.c b/drivers/usb/common/led.c
index df23da00a901..9ef109259c56 100644
--- a/drivers/usb/common/led.c
+++ b/drivers/usb/common/led.c
@@ -7,6 +7,8 @@ 
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 4aa5195db8ea..a5b48f73e1f7 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/ulpi/interface.h>
diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c
index b8fe31e409a5..98ce43d22931 100644
--- a/drivers/usb/common/usb-otg-fsm.c
+++ b/drivers/usb/common/usb-otg-fsm.c
@@ -19,6 +19,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile
index 250ec1d662d9..dd30053e11dc 100644
--- a/drivers/usb/core/Makefile
+++ b/drivers/usb/core/Makefile
@@ -1,6 +1,7 @@ 
 #
 # Makefile for USB Core files and filesystem
 #
+# SPDX-License-Identifier: GPL-2.0
 
 usbcore-y := usb.o hub.o hcd.o urb.o message.o driver.o
 usbcore-y += config.o file.o buffer.o sysfs.o endpoint.o
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index 55dea2e7828f..84b9b2403304 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -47,6 +47,8 @@ 
  * 2000-07-05: Ashley Montanaro <ashley@compsoc.man.ac.uk>
  *   Converted file reading routine to dump to buffer once
  *   per device, not per bus
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/fs.h>
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 4664e543cf2f..27ad93f47612 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1,4 +1,8 @@ 
-/*****************************************************************************/
+/*
+ * ***************************************************************************
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
 
 /*
  *      devio.c  --  User space communication with USB devices.
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index ea829ad798c0..966d9d40100d 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -14,6 +14,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 67aa3d039b9b..6aa49804d791 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -20,6 +20,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/bcd.h>
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 34c1a7e22aae..a646f3cba898 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -17,6 +17,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/usb.h>
diff --git a/drivers/usb/core/ledtrig-usbport.c b/drivers/usb/core/ledtrig-usbport.c
index 1af877942110..937faa8b2d04 100644
--- a/drivers/usb/core/ledtrig-usbport.c
+++ b/drivers/usb/core/ledtrig-usbport.c
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/core/of.c b/drivers/usb/core/of.c
index 3863bb1ce8c5..da04538b40d4 100644
--- a/drivers/usb/core/of.c
+++ b/drivers/usb/core/of.c
@@ -15,6 +15,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/of.h>
diff --git a/drivers/usb/core/otg_whitelist.h b/drivers/usb/core/otg_whitelist.h
index 085049d37d7a..e9d806e07d99 100644
--- a/drivers/usb/core/otg_whitelist.h
+++ b/drivers/usb/core/otg_whitelist.h
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 /*
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 460c855be0d0..405ed6288923 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -14,6 +14,8 @@ 
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/slab.h>
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 82806e311202..52d27cd0e89a 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -9,6 +9,8 @@ 
  * Software Foundation, version 2.
  *
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/usb.h>
diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index ef9cf4a21afe..42785bef7521 100644
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -7,6 +7,8 @@ 
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation, version 2.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/module.h>
 #include <linux/usb.h>
diff --git a/drivers/usb/dwc2/Makefile b/drivers/usb/dwc2/Makefile
index b9237e1e45d0..440320cc20a4 100644
--- a/drivers/usb/dwc2/Makefile
+++ b/drivers/usb/dwc2/Makefile
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_USB_DWC2_DEBUG)	+= -DDEBUG
 ccflags-$(CONFIG_USB_DWC2_VERBOSE)	+= -DVERBOSE_DEBUG
 
diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 1b6612c2cdda..25fd212ba42a 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 /*
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 8367d4f985c1..34eb86fbc7c2 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 #ifndef __DWC2_CORE_H__
diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
index b8bcb007c92a..4671558987cc 100644
--- a/drivers/usb/dwc2/core_intr.c
+++ b/drivers/usb/dwc2/core_intr.c
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 /*
diff --git a/drivers/usb/dwc2/debug.h b/drivers/usb/dwc2/debug.h
index 8222783e6822..2af23d3c54c7 100644
--- a/drivers/usb/dwc2/debug.h
+++ b/drivers/usb/dwc2/debug.h
@@ -12,6 +12,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include "core.h"
diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
index 794b959a7c8c..d79585f1f02c 100644
--- a/drivers/usb/dwc2/debugfs.c
+++ b/drivers/usb/dwc2/debugfs.c
@@ -12,6 +12,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/spinlock.h>
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 0d8e09ccb59c..d903efd98152 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -12,6 +12,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index c2631145f404..99f1921a6b5f 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 /*
diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
index 11c3c145b793..e85ed14aea84 100644
--- a/drivers/usb/dwc2/hcd.h
+++ b/drivers/usb/dwc2/hcd.h
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 #ifndef __DWC2_HCD_H__
 #define __DWC2_HCD_H__
diff --git a/drivers/usb/dwc2/hcd_ddma.c b/drivers/usb/dwc2/hcd_ddma.c
index b8bdf545c3a7..5e54d8279dda 100644
--- a/drivers/usb/dwc2/hcd_ddma.c
+++ b/drivers/usb/dwc2/hcd_ddma.c
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 /*
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
index 28a8210710b1..b0e605c85a66 100644
--- a/drivers/usb/dwc2/hcd_intr.c
+++ b/drivers/usb/dwc2/hcd_intr.c
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 /*
diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
index 3ae8b1bbaa55..8f639e59fe3e 100644
--- a/drivers/usb/dwc2/hcd_queue.c
+++ b/drivers/usb/dwc2/hcd_queue.c
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 /*
diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h
index 4592012c4743..097cdb047163 100644
--- a/drivers/usb/dwc2/hw.h
+++ b/drivers/usb/dwc2/hw.h
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 #ifndef __DWC2_HW_H__
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index a3ffe97170ff..7ffd272751ad 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -30,6 +30,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c
index fdeb8c7bf30a..c25def64d0db 100644
--- a/drivers/usb/dwc2/pci.c
+++ b/drivers/usb/dwc2/pci.c
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 /*
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index daf0d37acb37..95ff6cd621ff 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -32,6 +32,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index f15fabbd1e59..1c93fed3bcd4 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -1,4 +1,5 @@ 
 # define_trace.h needs to know how to find our header
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS_trace.o				:= -I$(src)
 
 obj-$(CONFIG_USB_DWC3)			+= dwc3.o
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 03474d3575ab..4100dd29aae2 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -17,6 +17,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/version.h>
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index ea910acb4bb0..772c4cb1ea3b 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __DRIVERS_USB_DWC3_CORE_H
diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h
index 5e9c070ec874..e16b04fe6ec0 100644
--- a/drivers/usb/dwc3/debug.h
+++ b/drivers/usb/dwc3/debug.h
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __DWC3_DEBUG_H
diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c
index 4e09be80e59f..8439da653f78 100644
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c
index 2765c51c7ef5..2d1be37a0524 100644
--- a/drivers/usb/dwc3/drd.c
+++ b/drivers/usb/dwc3/drd.c
@@ -16,6 +16,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/extcon.h>
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index e089df72f766..5ebd7ab2f131 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c
index d2ed9523e77c..b966c987eb42 100644
--- a/drivers/usb/dwc3/dwc3-keystone.c
+++ b/drivers/usb/dwc3/dwc3-keystone.c
@@ -13,6 +13,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c
index a26d1fde0f5e..f475c6baf6f0 100644
--- a/drivers/usb/dwc3/dwc3-of-simple.c
+++ b/drivers/usb/dwc3/dwc3-of-simple.c
@@ -17,6 +17,8 @@ 
  * This is a combination of the old dwc3-qcom.c by Ivan T. Ivanov
  * <iivanov@mm-sol.com> and the original patch adding support for Xilinx' SoC
  * by Subbaraya Sundeep Bhatta <subbaraya.sundeep.bhatta@xilinx.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 3530795bbb8f..dd3d2c13351f 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 54343fbd85ee..bdcce034b1f7 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
index 505676fd3ba4..6348baf15ff9 100644
--- a/drivers/usb/dwc3/dwc3-st.c
+++ b/drivers/usb/dwc3/dwc3-st.c
@@ -16,6 +16,8 @@ 
  * (at your option) any later version.
  *
  * Inspired by dwc3-omap.c and dwc3-exynos.c.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/delay.h>
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 75e6cb044eb2..b50d3d1b2e20 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index f064f1549333..5907b3e9d9c1 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 4a3227543255..79f675f88327 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __DRIVERS_USB_DWC3_GADGET_H
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index 76f0b0df37c1..5bd8b4b1ccb8 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -13,6 +13,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/platform_device.h>
diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index c69b06696824..4584783d9595 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __DRIVERS_USB_DWC3_IO_H
diff --git a/drivers/usb/dwc3/trace.c b/drivers/usb/dwc3/trace.c
index 6cd166412ad0..0a09dcb91e0e 100644
--- a/drivers/usb/dwc3/trace.c
+++ b/drivers/usb/dwc3/trace.c
@@ -13,6 +13,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #define CREATE_TRACE_POINTS
diff --git a/drivers/usb/dwc3/trace.h b/drivers/usb/dwc3/trace.h
index 6504b116da04..cce0c8d8a1ba 100644
--- a/drivers/usb/dwc3/trace.h
+++ b/drivers/usb/dwc3/trace.h
@@ -13,6 +13,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #undef TRACE_SYSTEM
diff --git a/drivers/usb/dwc3/ulpi.c b/drivers/usb/dwc3/ulpi.c
index e87ce8e9edee..882066728ae9 100644
--- a/drivers/usb/dwc3/ulpi.c
+++ b/drivers/usb/dwc3/ulpi.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/ulpi/regs.h>
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
index e2654443e8eb..20231447d0f6 100644
--- a/drivers/usb/early/ehci-dbgp.c
+++ b/drivers/usb/early/ehci-dbgp.c
@@ -9,6 +9,8 @@ 
  *  Jason Wessel <jason.wessel@windriver.com>
  *  Copyright (C) 2009 Wind River Systems, Inc.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/console.h>
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c
index 12fe70beae69..e83761ed3705 100644
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #define pr_fmt(fmt)	KBUILD_MODNAME ":%s: " fmt, __func__
diff --git a/drivers/usb/early/xhci-dbc.h b/drivers/usb/early/xhci-dbc.h
index 2df0f6e613fe..214a9d41736b 100644
--- a/drivers/usb/early/xhci-dbc.h
+++ b/drivers/usb/early/xhci-dbc.h
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __LINUX_XHCI_DBC_H
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 598a67d6ba05..89e35826a648 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -1,6 +1,7 @@ 
 #
 # USB peripheral controller drivers
 #
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG)	:= -DDEBUG
 subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE)	+= -DVERBOSE_DEBUG
 ccflags-y				+= -I$(srctree)/drivers/usb/gadget/udc
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 5d061b3d8224..d3953f684925 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c
index 17a6077b89a4..cfc783c2148f 100644
--- a/drivers/usb/gadget/config.c
+++ b/drivers/usb/gadget/config.c
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 #include <linux/errno.h>
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index aeb9f3c40521..8b3f2c4fac34 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/configfs.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/configfs.h b/drivers/usb/gadget/configfs.h
index 540d5e92ed22..83ddbe4e05dc 100644
--- a/drivers/usb/gadget/configfs.h
+++ b/drivers/usb/gadget/configfs.h
@@ -1,5 +1,6 @@ 
 #ifndef USB__GADGET__CONFIGFS__H
 #define USB__GADGET__CONFIGFS__H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/configfs.h>
 
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 30fdab0ae383..c0409aab5524 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
index 86e825269947..3ab98e9784e3 100644
--- a/drivers/usb/gadget/function/Makefile
+++ b/drivers/usb/gadget/function/Makefile
@@ -1,6 +1,7 @@ 
 #
 # USB peripheral controller drivers
 #
+# SPDX-License-Identifier: GPL-2.0
 
 ccflags-y			:= -I$(srctree)/drivers/usb/gadget/
 ccflags-y			+= -I$(srctree)/drivers/usb/gadget/udc/
diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index 5e3828d9dac7..d7ece74974e1 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -10,6 +10,8 @@ 
  * This software is distributed under the terms of the GNU General
  * Public License ("GPL") as published by the Free Software Foundation,
  * either version 2 of that License or (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
index 4c488d15b6f6..3465f2c686c0 100644
--- a/drivers/usb/gadget/function/f_ecm.c
+++ b/drivers/usb/gadget/function/f_ecm.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_eem.c b/drivers/usb/gadget/function/f_eem.c
index 007ec6e4a5d4..492de5fc2362 100644
--- a/drivers/usb/gadget/function/f_eem.c
+++ b/drivers/usb/gadget/function/f_eem.c
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 8b342587f8ad..fcc66058068e 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -12,6 +12,8 @@ 
  * 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+
  */
 
 
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index d8e359ef6eb1..3df0e7118914 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
index e70093835e14..9e8188a8a7c3 100644
--- a/drivers/usb/gadget/function/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index 5153e29870c3..59f1276e3557 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -35,6 +35,8 @@ 
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 /*
diff --git a/drivers/usb/gadget/function/f_mass_storage.h b/drivers/usb/gadget/function/f_mass_storage.h
index dc05ca0c4359..1232b3317a6b 100644
--- a/drivers/usb/gadget/function/f_mass_storage.h
+++ b/drivers/usb/gadget/function/f_mass_storage.h
@@ -1,5 +1,6 @@ 
 #ifndef USB_F_MASS_STORAGE_H
 #define USB_F_MASS_STORAGE_H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/usb/composite.h>
 #include "storage_common.h"
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 5d3d7941d2c2..3cc64c2120b2 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -17,6 +17,8 @@ 
  *   Ben Williamson <ben.williamson@greyinnovation.com>
  *
  * Licensed under the GPL-2 or later.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 45b334ceaf2e..ef2c393e5654 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_obex.c b/drivers/usb/gadget/function/f_obex.c
index d43e86cea74f..1e9a28d006c3 100644
--- a/drivers/usb/gadget/function/f_obex.c
+++ b/drivers/usb/gadget/function/f_obex.c
@@ -10,6 +10,8 @@ 
  * 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+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c
index 9c4c58e4a1a2..407bb7345cfe 100644
--- a/drivers/usb/gadget/function/f_phonet.c
+++ b/drivers/usb/gadget/function/f_phonet.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/mm.h>
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index ea0da35a44e2..ca08c4e6d66e 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
index c7c5b3ce1d98..76527af37b2d 100644
--- a/drivers/usb/gadget/function/f_rndis.c
+++ b/drivers/usb/gadget/function/f_rndis.c
@@ -11,6 +11,8 @@ 
  * 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+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_serial.c b/drivers/usb/gadget/function/f_serial.c
index cb00ada21d9c..0492d8d18572 100644
--- a/drivers/usb/gadget/function/f_serial.c
+++ b/drivers/usb/gadget/function/f_serial.c
@@ -8,6 +8,8 @@ 
  * This software is distributed under the terms of the GNU General
  * Public License ("GPL") as published by the Free Software Foundation,
  * either version 2 of that License or (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
index 8784fa12ea2c..2e053ccb8d63 100644
--- a/drivers/usb/gadget/function/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c
index 434b983f3b4c..ac1fc6f6468f 100644
--- a/drivers/usb/gadget/function/f_subset.c
+++ b/drivers/usb/gadget/function/f_subset.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index a82e2bd5ea34..d27d61b5509d 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -5,6 +5,8 @@ 
  *
  * Author: Sebastian Andrzej Siewior <bigeasy at linutronix dot de>
  * License: GPLv2 as published by FSF.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 29efbedc91f9..fc211270d76c 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -15,6 +15,8 @@ 
  * 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+
  */
 
 #include <linux/usb/audio.h>
diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c
index 5d229e72912e..1ecbdfc9b24f 100644
--- a/drivers/usb/gadget/function/f_uac1_legacy.c
+++ b/drivers/usb/gadget/function/f_uac1_legacy.c
@@ -7,6 +7,8 @@ 
  * Enter bugs at http://blackfin.uclinux.org/
  *
  * Licensed under the GPL-2 or later.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index f05c3f3e6103..d3081384b984 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 #include <linux/usb/audio.h>
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index f8a1881609a2..e023efd31a87 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -8,6 +8,8 @@ 
  *	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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/f_uvc.h b/drivers/usb/gadget/function/f_uvc.h
index d0a73bdcbba1..d5f3ebea83dc 100644
--- a/drivers/usb/gadget/function/f_uvc.h
+++ b/drivers/usb/gadget/function/f_uvc.h
@@ -8,6 +8,8 @@ 
  *	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+
  */
 
 #ifndef _F_UVC_H_
diff --git a/drivers/usb/gadget/function/g_zero.h b/drivers/usb/gadget/function/g_zero.h
index 492924d0d599..e27a17d52f6c 100644
--- a/drivers/usb/gadget/function/g_zero.h
+++ b/drivers/usb/gadget/function/g_zero.h
@@ -1,6 +1,8 @@ 
 /*
  * This header declares the utility functions used by "Gadget Zero", plus
  * interfaces to its two single-configuration function drivers.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __G_ZERO_H
diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index d6341045c631..3e4f1c996db9 100644
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -19,6 +19,8 @@ 
  *
  * Copyright (C) 2004 by David Brownell
  *		updates to merge with Linux 2.6, better match RNDIS spec
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/function/rndis.h b/drivers/usb/gadget/function/rndis.h
index 21e0430ffb98..0c33e1a379a5 100644
--- a/drivers/usb/gadget/function/rndis.h
+++ b/drivers/usb/gadget/function/rndis.h
@@ -10,6 +10,8 @@ 
  *
  *		This software was originally developed in conformance with
  *		Microsoft's Remote NDIS Specification License Agreement.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _LINUX_RNDIS_H
diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c
index 8fbf6861690d..8f00425432e9 100644
--- a/drivers/usb/gadget/function/storage_common.c
+++ b/drivers/usb/gadget/function/storage_common.c
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 /*
diff --git a/drivers/usb/gadget/function/storage_common.h b/drivers/usb/gadget/function/storage_common.h
index e0814a960132..18538737c292 100644
--- a/drivers/usb/gadget/function/storage_common.h
+++ b/drivers/usb/gadget/function/storage_common.h
@@ -1,5 +1,6 @@ 
 #ifndef USB_STORAGE_COMMON_H
 #define USB_STORAGE_COMMON_H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/device.h>
 #include <linux/usb/storage.h>
diff --git a/drivers/usb/gadget/function/tcm.h b/drivers/usb/gadget/function/tcm.h
index a27e6e34db0b..6eff94ab481f 100644
--- a/drivers/usb/gadget/function/tcm.h
+++ b/drivers/usb/gadget/function/tcm.h
@@ -1,5 +1,6 @@ 
 #ifndef __TARGET_USB_GADGET_H__
 #define __TARGET_USB_GADGET_H__
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/kref.h>
 /* #include <linux/usb/uas.h> */
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c
index 3971bbab88bd..1e65c4b1ded8 100644
--- a/drivers/usb/gadget/function/u_audio.c
+++ b/drivers/usb/gadget/function/u_audio.c
@@ -19,6 +19,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/function/u_audio.h b/drivers/usb/gadget/function/u_audio.h
index 07e13784cbb8..195bd8708a5c 100644
--- a/drivers/usb/gadget/function/u_audio.h
+++ b/drivers/usb/gadget/function/u_audio.h
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __U_AUDIO_H
diff --git a/drivers/usb/gadget/function/u_ecm.h b/drivers/usb/gadget/function/u_ecm.h
index 262cc03cc2c0..f6376d694f0a 100644
--- a/drivers/usb/gadget/function/u_ecm.h
+++ b/drivers/usb/gadget/function/u_ecm.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_ECM_H
diff --git a/drivers/usb/gadget/function/u_eem.h b/drivers/usb/gadget/function/u_eem.h
index e3ae97874c4f..a53db5e7d7dd 100644
--- a/drivers/usb/gadget/function/u_eem.h
+++ b/drivers/usb/gadget/function/u_eem.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_EEM_H
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index bdbc3fdc7c4f..67da87e5ec2c 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/u_ether.h b/drivers/usb/gadget/function/u_ether.h
index c77145bd6b5b..c4e7f2eb2f5d 100644
--- a/drivers/usb/gadget/function/u_ether.h
+++ b/drivers/usb/gadget/function/u_ether.h
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 #ifndef __U_ETHER_H
diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h
index e4c3f84af4c3..7cdc9bf9e533 100644
--- a/drivers/usb/gadget/function/u_ether_configfs.h
+++ b/drivers/usb/gadget/function/u_ether_configfs.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __U_ETHER_CONFIGFS_H
diff --git a/drivers/usb/gadget/function/u_fs.h b/drivers/usb/gadget/function/u_fs.h
index 79f70ebf85dc..2aa589a2130e 100644
--- a/drivers/usb/gadget/function/u_fs.h
+++ b/drivers/usb/gadget/function/u_fs.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_FFS_H
diff --git a/drivers/usb/gadget/function/u_gether.h b/drivers/usb/gadget/function/u_gether.h
index d4078426ba5d..5098538bcb3c 100644
--- a/drivers/usb/gadget/function/u_gether.h
+++ b/drivers/usb/gadget/function/u_gether.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_GETHER_H
diff --git a/drivers/usb/gadget/function/u_hid.h b/drivers/usb/gadget/function/u_hid.h
index aaa0e368a159..adae49b212d9 100644
--- a/drivers/usb/gadget/function/u_hid.h
+++ b/drivers/usb/gadget/function/u_hid.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_HID_H
diff --git a/drivers/usb/gadget/function/u_midi.h b/drivers/usb/gadget/function/u_midi.h
index 22510189758e..daab0912dcb1 100644
--- a/drivers/usb/gadget/function/u_midi.h
+++ b/drivers/usb/gadget/function/u_midi.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_MIDI_H
diff --git a/drivers/usb/gadget/function/u_ncm.h b/drivers/usb/gadget/function/u_ncm.h
index ce0f3a78ca13..0774b49cb7f7 100644
--- a/drivers/usb/gadget/function/u_ncm.h
+++ b/drivers/usb/gadget/function/u_ncm.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_NCM_H
diff --git a/drivers/usb/gadget/function/u_phonet.h b/drivers/usb/gadget/function/u_phonet.h
index 98ced18779ea..7ab7cac1c4b2 100644
--- a/drivers/usb/gadget/function/u_phonet.h
+++ b/drivers/usb/gadget/function/u_phonet.h
@@ -6,6 +6,8 @@ 
  * This software is distributed under the terms of the GNU General
  * Public License ("GPL") as published by the Free Software Foundation,
  * either version 2 of that License or (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __U_PHONET_H
diff --git a/drivers/usb/gadget/function/u_printer.h b/drivers/usb/gadget/function/u_printer.h
index 8d30b7577f87..93543f0d16a2 100644
--- a/drivers/usb/gadget/function/u_printer.h
+++ b/drivers/usb/gadget/function/u_printer.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_PRINTER_H
diff --git a/drivers/usb/gadget/function/u_rndis.h b/drivers/usb/gadget/function/u_rndis.h
index efdb7ac381d9..4281d468fc2c 100644
--- a/drivers/usb/gadget/function/u_rndis.h
+++ b/drivers/usb/gadget/function/u_rndis.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_RNDIS_H
diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index 4176216d54be..bf1b6826e660 100644
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -13,6 +13,8 @@ 
  * This software is distributed under the terms of the GNU General
  * Public License ("GPL") as published by the Free Software Foundation,
  * either version 2 of that License or (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/function/u_serial.h b/drivers/usb/gadget/function/u_serial.h
index c20210c0babd..14d0dcce553a 100644
--- a/drivers/usb/gadget/function/u_serial.h
+++ b/drivers/usb/gadget/function/u_serial.h
@@ -7,6 +7,8 @@ 
  * This software is distributed under the terms of the GNU General
  * Public License ("GPL") as published by the Free Software Foundation,
  * either version 2 of that License or (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __U_SERIAL_H
diff --git a/drivers/usb/gadget/function/u_tcm.h b/drivers/usb/gadget/function/u_tcm.h
index 0bd751e0483f..ba4ca7cb4bb8 100644
--- a/drivers/usb/gadget/function/u_tcm.h
+++ b/drivers/usb/gadget/function/u_tcm.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_TCM_H
diff --git a/drivers/usb/gadget/function/u_uac1.h b/drivers/usb/gadget/function/u_uac1.h
index 6f188fd8633f..0edd3e6836cb 100644
--- a/drivers/usb/gadget/function/u_uac1.h
+++ b/drivers/usb/gadget/function/u_uac1.h
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __U_UAC1_H
diff --git a/drivers/usb/gadget/function/u_uac1_legacy.c b/drivers/usb/gadget/function/u_uac1_legacy.c
index fa4684a1c54c..917aae636f59 100644
--- a/drivers/usb/gadget/function/u_uac1_legacy.c
+++ b/drivers/usb/gadget/function/u_uac1_legacy.c
@@ -7,6 +7,8 @@ 
  * Enter bugs at http://blackfin.uclinux.org/
  *
  * Licensed under the GPL-2 or later.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/u_uac1_legacy.h b/drivers/usb/gadget/function/u_uac1_legacy.h
index d715b1af56a4..aafcad51e6ec 100644
--- a/drivers/usb/gadget/function/u_uac1_legacy.h
+++ b/drivers/usb/gadget/function/u_uac1_legacy.h
@@ -7,6 +7,8 @@ 
  * Enter bugs at http://blackfin.uclinux.org/
  *
  * Licensed under the GPL-2 or later.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __U_UAC1_LEGACY_H
diff --git a/drivers/usb/gadget/function/u_uac2.h b/drivers/usb/gadget/function/u_uac2.h
index 19eeb83538a5..c46e4b0451ef 100644
--- a/drivers/usb/gadget/function/u_uac2.h
+++ b/drivers/usb/gadget/function/u_uac2.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_UAC2_H
diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h
index 4676b60a5063..09014eae95d4 100644
--- a/drivers/usb/gadget/function/u_uvc.h
+++ b/drivers/usb/gadget/function/u_uvc.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef U_UVC_H
diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h
index 11d70dead32b..682dd940ea0e 100644
--- a/drivers/usb/gadget/function/uvc.h
+++ b/drivers/usb/gadget/function/uvc.h
@@ -8,6 +8,8 @@ 
  *	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+
  */
 
 #ifndef _UVC_GADGET_H_
diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index 844cb738bafd..b1c7bdac1900 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include "u_uvc.h"
 #include "uvc_configfs.h"
diff --git a/drivers/usb/gadget/function/uvc_configfs.h b/drivers/usb/gadget/function/uvc_configfs.h
index 085e67be7c71..32171fe4b593 100644
--- a/drivers/usb/gadget/function/uvc_configfs.h
+++ b/drivers/usb/gadget/function/uvc_configfs.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #ifndef UVC_CONFIGFS_H
 #define UVC_CONFIGFS_H
diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c
index 6377e9fee6e5..b0ad43d2bb2b 100644
--- a/drivers/usb/gadget/function/uvc_queue.c
+++ b/drivers/usb/gadget/function/uvc_queue.c
@@ -8,6 +8,8 @@ 
  *	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+
  */
 
 #include <linux/atomic.h>
diff --git a/drivers/usb/gadget/function/uvc_queue.h b/drivers/usb/gadget/function/uvc_queue.h
index ac461a9a1a70..b5567f67c8e4 100644
--- a/drivers/usb/gadget/function/uvc_queue.h
+++ b/drivers/usb/gadget/function/uvc_queue.h
@@ -1,5 +1,6 @@ 
 #ifndef _UVC_QUEUE_H_
 #define _UVC_QUEUE_H_
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifdef __KERNEL__
 
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index 3e22b45687d3..dffcf282cc8c 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -8,6 +8,8 @@ 
  *	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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/uvc_v4l2.h b/drivers/usb/gadget/function/uvc_v4l2.h
index 2683b92fda65..0a33442ed3db 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.h
+++ b/drivers/usb/gadget/function/uvc_v4l2.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __UVC_V4L2_H__
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index 0f01c04d7cbd..93c628ca5f30 100644
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -8,6 +8,8 @@ 
  *	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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/function/uvc_video.h b/drivers/usb/gadget/function/uvc_video.h
index ef00f06fa00b..c3e70f90216a 100644
--- a/drivers/usb/gadget/function/uvc_video.h
+++ b/drivers/usb/gadget/function/uvc_video.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #ifndef __UVC_VIDEO_H__
 #define __UVC_VIDEO_H__
diff --git a/drivers/usb/gadget/functions.c b/drivers/usb/gadget/functions.c
index b13f839e7368..00979a9fe4f3 100644
--- a/drivers/usb/gadget/functions.c
+++ b/drivers/usb/gadget/functions.c
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile
index 7f485f25705e..2773a2226388 100644
--- a/drivers/usb/gadget/legacy/Makefile
+++ b/drivers/usb/gadget/legacy/Makefile
@@ -1,6 +1,7 @@ 
 #
 # USB gadget drivers
 #
+# SPDX-License-Identifier: GPL-2.0
 
 ccflags-y			:= -I$(srctree)/drivers/usb/gadget/
 ccflags-y			+= -I$(srctree)/drivers/usb/gadget/udc/
diff --git a/drivers/usb/gadget/legacy/acm_ms.c b/drivers/usb/gadget/legacy/acm_ms.c
index c39de65a448b..667f5a914965 100644
--- a/drivers/usb/gadget/legacy/acm_ms.c
+++ b/drivers/usb/gadget/legacy/acm_ms.c
@@ -12,6 +12,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c
index 1f5cdbe162df..06dd786b3d04 100644
--- a/drivers/usb/gadget/legacy/audio.c
+++ b/drivers/usb/gadget/legacy/audio.c
@@ -7,6 +7,8 @@ 
  * Enter bugs at http://blackfin.uclinux.org/
  *
  * Licensed under the GPL-2 or later.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/legacy/cdc2.c b/drivers/usb/gadget/legacy/cdc2.c
index 51c08682de84..97b35a22123e 100644
--- a/drivers/usb/gadget/legacy/cdc2.c
+++ b/drivers/usb/gadget/legacy/cdc2.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
index 99ca3dabc4f3..22e70ada6baa 100644
--- a/drivers/usb/gadget/legacy/dbgp.c
+++ b/drivers/usb/gadget/legacy/dbgp.c
@@ -4,6 +4,8 @@ 
  * Copyright (C) 2010 Stephane Duverger
  *
  * Released under the GPLv2.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /* verbose messages */
diff --git a/drivers/usb/gadget/legacy/ether.c b/drivers/usb/gadget/legacy/ether.c
index 25a2c2e48592..39458881e606 100644
--- a/drivers/usb/gadget/legacy/ether.c
+++ b/drivers/usb/gadget/legacy/ether.c
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/legacy/g_ffs.c b/drivers/usb/gadget/legacy/g_ffs.c
index 6da7316f8e87..ab49e6b9a3ff 100644
--- a/drivers/usb/gadget/legacy/g_ffs.c
+++ b/drivers/usb/gadget/legacy/g_ffs.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 #define pr_fmt(fmt) "g_ffs: " fmt
diff --git a/drivers/usb/gadget/legacy/gmidi.c b/drivers/usb/gadget/legacy/gmidi.c
index 0bf39c3ccdb1..54cf183f2d99 100644
--- a/drivers/usb/gadget/legacy/gmidi.c
+++ b/drivers/usb/gadget/legacy/gmidi.c
@@ -16,6 +16,8 @@ 
  *
  * Refer to the USB Device Class Definition for MIDI Devices:
  * http://www.usb.org/developers/devclass_docs/midi10.pdf
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/legacy/hid.c b/drivers/usb/gadget/legacy/hid.c
index a71a884f79fc..dbd0dd82f291 100644
--- a/drivers/usb/gadget/legacy/hid.c
+++ b/drivers/usb/gadget/legacy/hid.c
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 5c28bee327e1..69088710fc76 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 
diff --git a/drivers/usb/gadget/legacy/mass_storage.c b/drivers/usb/gadget/legacy/mass_storage.c
index fcba59782f26..66426c6c8594 100644
--- a/drivers/usb/gadget/legacy/mass_storage.c
+++ b/drivers/usb/gadget/legacy/mass_storage.c
@@ -10,6 +10,8 @@ 
  * 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+
  */
 
 
diff --git a/drivers/usb/gadget/legacy/multi.c b/drivers/usb/gadget/legacy/multi.c
index a70a406580ea..4c389fe832c0 100644
--- a/drivers/usb/gadget/legacy/multi.c
+++ b/drivers/usb/gadget/legacy/multi.c
@@ -10,6 +10,8 @@ 
  * 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+
  */
 
 
diff --git a/drivers/usb/gadget/legacy/ncm.c b/drivers/usb/gadget/legacy/ncm.c
index 0aba68253e3d..2586305ed2b5 100644
--- a/drivers/usb/gadget/legacy/ncm.c
+++ b/drivers/usb/gadget/legacy/ncm.c
@@ -14,6 +14,8 @@ 
  * 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+
  */
 
 /* #define DEBUG */
diff --git a/drivers/usb/gadget/legacy/nokia.c b/drivers/usb/gadget/legacy/nokia.c
index b1e535f4022e..a0fccbae746d 100644
--- a/drivers/usb/gadget/legacy/nokia.c
+++ b/drivers/usb/gadget/legacy/nokia.c
@@ -13,6 +13,8 @@ 
  * This software is distributed under the terms of the GNU General
  * Public License ("GPL") as published by the Free Software Foundation,
  * version 2 of that License.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/printer.c b/drivers/usb/gadget/legacy/printer.c
index 4c9cfff34a03..5bb838f4a8a3 100644
--- a/drivers/usb/gadget/legacy/printer.c
+++ b/drivers/usb/gadget/legacy/printer.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/legacy/serial.c b/drivers/usb/gadget/legacy/serial.c
index 9d89adce756d..ac3082111d06 100644
--- a/drivers/usb/gadget/legacy/serial.c
+++ b/drivers/usb/gadget/legacy/serial.c
@@ -8,6 +8,8 @@ 
  * This software is distributed under the terms of the GNU General
  * Public License ("GPL") as published by the Free Software Foundation,
  * either version 2 of that License or (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/tcm_usb_gadget.c b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
index 0b0bb98319cd..0fc3ddc17701 100644
--- a/drivers/usb/gadget/legacy/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
@@ -5,6 +5,8 @@ 
  *
  * Author: Sebastian Andrzej Siewior <bigeasy at linutronix dot de>
  * License: GPLv2 as published by FSF.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c
index 82c13fce9232..5789010af925 100644
--- a/drivers/usb/gadget/legacy/webcam.c
+++ b/drivers/usb/gadget/legacy/webcam.c
@@ -8,6 +8,8 @@ 
  *	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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/legacy/zero.c b/drivers/usb/gadget/legacy/zero.c
index d02e2ce73ea5..3c1fc247a59f 100644
--- a/drivers/usb/gadget/legacy/zero.c
+++ b/drivers/usb/gadget/legacy/zero.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 /*
diff --git a/drivers/usb/gadget/u_f.c b/drivers/usb/gadget/u_f.c
index 18839732c840..19c39b9fbd2b 100644
--- a/drivers/usb/gadget/u_f.c
+++ b/drivers/usb/gadget/u_f.c
@@ -9,6 +9,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include "u_f.h"
diff --git a/drivers/usb/gadget/u_f.h b/drivers/usb/gadget/u_f.h
index 7d53a4773d1a..0df47f2c251c 100644
--- a/drivers/usb/gadget/u_f.h
+++ b/drivers/usb/gadget/u_f.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __U_F_H__
diff --git a/drivers/usb/gadget/u_os_desc.h b/drivers/usb/gadget/u_os_desc.h
index 947b7ddff691..72ff75c4cc22 100644
--- a/drivers/usb/gadget/u_os_desc.h
+++ b/drivers/usb/gadget/u_os_desc.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __U_OS_DESC_H__
diff --git a/drivers/usb/gadget/udc/Makefile b/drivers/usb/gadget/udc/Makefile
index ea9e1c7f1923..3c19d974a592 100644
--- a/drivers/usb/gadget/udc/Makefile
+++ b/drivers/usb/gadget/udc/Makefile
@@ -1,4 +1,5 @@ 
 # define_trace.h needs to know how to find our header
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS_trace.o			:= -I$(src)
 
 udc-core-y			:= core.o trace.o
diff --git a/drivers/usb/gadget/udc/amd5536udc.h b/drivers/usb/gadget/udc/amd5536udc.h
index 4fe22d432af2..31c11c00497d 100644
--- a/drivers/usb/gadget/udc/amd5536udc.h
+++ b/drivers/usb/gadget/udc/amd5536udc.h
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 #ifndef AMD5536UDC_H
diff --git a/drivers/usb/gadget/udc/amd5536udc_pci.c b/drivers/usb/gadget/udc/amd5536udc_pci.c
index 57a13f080a79..12996d1939f4 100644
--- a/drivers/usb/gadget/udc/amd5536udc_pci.c
+++ b/drivers/usb/gadget/udc/amd5536udc_pci.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
index 8bc78418d40e..b4a2acb7e51f 100644
--- a/drivers/usb/gadget/udc/at91_udc.c
+++ b/drivers/usb/gadget/udc/at91_udc.c
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 #undef	VERBOSE_DEBUG
diff --git a/drivers/usb/gadget/udc/at91_udc.h b/drivers/usb/gadget/udc/at91_udc.h
index 9bbe72764f31..8a187289cf59 100644
--- a/drivers/usb/gadget/udc/at91_udc.h
+++ b/drivers/usb/gadget/udc/at91_udc.h
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 #ifndef AT91_UDC_H
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index a884c022df7a..f8d6e2048d20 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/clk.h>
 #include <linux/clk/at91_pmc.h>
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h
index f8ebe0389bd4..4af8abc7c569 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.h
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.h
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #ifndef __LINUX_USB_GADGET_USBA_UDC_H__
 #define __LINUX_USB_GADGET_USBA_UDC_H__
diff --git a/drivers/usb/gadget/udc/bcm63xx_udc.c b/drivers/usb/gadget/udc/bcm63xx_udc.c
index f78503203f42..5cfb0e1836c5 100644
--- a/drivers/usb/gadget/udc/bcm63xx_udc.c
+++ b/drivers/usb/gadget/udc/bcm63xx_udc.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 #include <linux/bitops.h>
diff --git a/drivers/usb/gadget/udc/bdc/Makefile b/drivers/usb/gadget/udc/bdc/Makefile
index 5cf6a3bcdf0f..52cb5ea48bbe 100644
--- a/drivers/usb/gadget/udc/bdc/Makefile
+++ b/drivers/usb/gadget/udc/bdc/Makefile
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_BDC_UDC)	+= bdc.o
 bdc-y	:= bdc_core.o bdc_cmd.o bdc_ep.o bdc_udc.o
 
diff --git a/drivers/usb/gadget/udc/bdc/bdc.h b/drivers/usb/gadget/udc/bdc/bdc.h
index 6df0352cdc50..1f9f657ae0b0 100644
--- a/drivers/usb/gadget/udc/bdc/bdc.h
+++ b/drivers/usb/gadget/udc/bdc/bdc.h
@@ -10,6 +10,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef	__LINUX_BDC_H__
diff --git a/drivers/usb/gadget/udc/bdc/bdc_cmd.c b/drivers/usb/gadget/udc/bdc/bdc_cmd.c
index 6e920f1dce02..88fbdfe8709f 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_cmd.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_cmd.c
@@ -10,6 +10,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/gadget/udc/bdc/bdc_cmd.h b/drivers/usb/gadget/udc/bdc/bdc_cmd.h
index 61d0e3bf9853..37a7e2226d6d 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_cmd.h
+++ b/drivers/usb/gadget/udc/bdc/bdc_cmd.h
@@ -10,6 +10,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #ifndef __LINUX_BDC_CMD_H__
 #define __LINUX_BDC_CMD_H__
diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c
index 7a8af4b916cf..d37e4c0ed6d1 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_core.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_core.c
@@ -10,6 +10,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/bdc/bdc_dbg.c b/drivers/usb/gadget/udc/bdc/bdc_dbg.c
index ac98f6f681b7..36af7dcf5537 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_dbg.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_dbg.c
@@ -10,6 +10,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include "bdc.h"
diff --git a/drivers/usb/gadget/udc/bdc/bdc_dbg.h b/drivers/usb/gadget/udc/bdc/bdc_dbg.h
index 338a6c701315..729222777a8b 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_dbg.h
+++ b/drivers/usb/gadget/udc/bdc/bdc_dbg.h
@@ -10,6 +10,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #ifndef __LINUX_BDC_DBG_H__
 #define __LINUX_BDC_DBG_H__
diff --git a/drivers/usb/gadget/udc/bdc/bdc_ep.c b/drivers/usb/gadget/udc/bdc/bdc_ep.c
index bfd8f7ade935..2cbd7e2e3bb8 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_ep.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c
@@ -12,6 +12,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/usb/gadget/udc/bdc/bdc_ep.h b/drivers/usb/gadget/udc/bdc/bdc_ep.h
index 8a6b36cbf2ea..8c9b41ce1ee2 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_ep.h
+++ b/drivers/usb/gadget/udc/bdc/bdc_ep.h
@@ -10,6 +10,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #ifndef __LINUX_BDC_EP_H__
 #define __LINUX_BDC_EP_H__
diff --git a/drivers/usb/gadget/udc/bdc/bdc_pci.c b/drivers/usb/gadget/udc/bdc/bdc_pci.c
index 02968842b359..675ef31997b1 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_pci.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_pci.c
@@ -12,6 +12,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/bdc/bdc_udc.c b/drivers/usb/gadget/udc/bdc/bdc_udc.c
index c84346146456..ab667a564f4f 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_udc.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_udc.c
@@ -12,6 +12,8 @@ 
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index d41d07aae0ce..1bb4ecf71c6c 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -15,6 +15,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index 8f0f69783c8b..d98cff53ecfd 100644
--- a/drivers/usb/gadget/udc/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
@@ -10,6 +10,8 @@ 
  * 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+
  */
 
 
diff --git a/drivers/usb/gadget/udc/fotg210-udc.c b/drivers/usb/gadget/udc/fotg210-udc.c
index 78d0204e3e20..18cca90ecd7c 100644
--- a/drivers/usb/gadget/udc/fotg210-udc.c
+++ b/drivers/usb/gadget/udc/fotg210-udc.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/gadget/udc/fotg210.h b/drivers/usb/gadget/udc/fotg210.h
index bbf991bcbe7c..920df1e7d2c2 100644
--- a/drivers/usb/gadget/udc/fotg210.h
+++ b/drivers/usb/gadget/udc/fotg210.h
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/fsl_mxc_udc.c b/drivers/usb/gadget/udc/fsl_mxc_udc.c
index f16e149c5b3e..a04f326ca1e0 100644
--- a/drivers/usb/gadget/udc/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/udc/fsl_mxc_udc.c
@@ -10,6 +10,8 @@ 
  * 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+
  */
 #include <linux/clk.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c
index a3e72d690eef..5d7422793cfd 100644
--- a/drivers/usb/gadget/udc/fsl_qe_udc.c
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.c
@@ -16,6 +16,8 @@ 
  * 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+
  */
 
 #undef USB_TRACE
diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.h b/drivers/usb/gadget/udc/fsl_qe_udc.h
index 7026919fc901..ceab16f0af9e 100644
--- a/drivers/usb/gadget/udc/fsl_qe_udc.h
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.h
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #ifndef __FSL_QE_UDC_H
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index 6f2f71c054be..18cad2c1db27 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -15,6 +15,8 @@ 
  * 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+
  */
 
 #undef VERBOSE
diff --git a/drivers/usb/gadget/udc/fsl_usb2_udc.h b/drivers/usb/gadget/udc/fsl_usb2_udc.h
index e92b8408b6f6..1599316cc490 100644
--- a/drivers/usb/gadget/udc/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/udc/fsl_usb2_udc.h
@@ -8,6 +8,8 @@ 
  * option) any later version.
  *
  * Freescale USB device/endpoint management registers
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #ifndef __FSL_USB2_UDC_H
 #define __FSL_USB2_UDC_H
diff --git a/drivers/usb/gadget/udc/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c
index e0c1b0099265..d4606768f602 100644
--- a/drivers/usb/gadget/udc/fusb300_udc.c
+++ b/drivers/usb/gadget/udc/fusb300_udc.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
diff --git a/drivers/usb/gadget/udc/fusb300_udc.h b/drivers/usb/gadget/udc/fusb300_udc.h
index ad39f892d200..51db212d6f44 100644
--- a/drivers/usb/gadget/udc/fusb300_udc.h
+++ b/drivers/usb/gadget/udc/fusb300_udc.h
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 
diff --git a/drivers/usb/gadget/udc/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c
index 8433c22900dc..6061108cae59 100644
--- a/drivers/usb/gadget/udc/goku_udc.c
+++ b/drivers/usb/gadget/udc/goku_udc.c
@@ -9,6 +9,8 @@ 
  * This file is licensed under the terms of the GNU General Public
  * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/goku_udc.h b/drivers/usb/gadget/udc/goku_udc.h
index 86d2adafe149..ebb1f1dd704d 100644
--- a/drivers/usb/gadget/udc/goku_udc.h
+++ b/drivers/usb/gadget/udc/goku_udc.h
@@ -9,6 +9,8 @@ 
  * This file is licensed under the terms of the GNU General Public
  * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c
index 1f9941145746..b6735117e44f 100644
--- a/drivers/usb/gadget/udc/gr_udc.c
+++ b/drivers/usb/gadget/udc/gr_udc.c
@@ -17,6 +17,8 @@ 
  * Contributors:
  * - Andreas Larsson <andreas@gaisler.com>
  * - Marko Isomaki
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/gr_udc.h b/drivers/usb/gadget/udc/gr_udc.h
index 4297c4e8021f..b579550b8e9f 100644
--- a/drivers/usb/gadget/udc/gr_udc.h
+++ b/drivers/usb/gadget/udc/gr_udc.h
@@ -17,6 +17,8 @@ 
  * Contributors:
  * - Andreas Larsson <andreas@gaisler.com>
  * - Marko Isomaki
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* Control registers on the AMBA bus */
diff --git a/drivers/usb/gadget/udc/lpc32xx_udc.c b/drivers/usb/gadget/udc/lpc32xx_udc.c
index 8f32b5ee7734..e867ad28950c 100644
--- a/drivers/usb/gadget/udc/lpc32xx_udc.c
+++ b/drivers/usb/gadget/udc/lpc32xx_udc.c
@@ -26,6 +26,8 @@ 
  * 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
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/gadget/udc/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c
index 3b8dbed7e2e9..8544df3aae5f 100644
--- a/drivers/usb/gadget/udc/m66592-udc.c
+++ b/drivers/usb/gadget/udc/m66592-udc.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/udc/m66592-udc.h b/drivers/usb/gadget/udc/m66592-udc.h
index 96d49d7bfb6b..9faccc2d4599 100644
--- a/drivers/usb/gadget/udc/m66592-udc.h
+++ b/drivers/usb/gadget/udc/m66592-udc.h
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __M66592_UDC_H__
diff --git a/drivers/usb/gadget/udc/mv_u3d.h b/drivers/usb/gadget/udc/mv_u3d.h
index e32a787ac373..53ad20e4168f 100644
--- a/drivers/usb/gadget/udc/mv_u3d.h
+++ b/drivers/usb/gadget/udc/mv_u3d.h
@@ -4,6 +4,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MV_U3D_H
diff --git a/drivers/usb/gadget/udc/mv_u3d_core.c b/drivers/usb/gadget/udc/mv_u3d_core.c
index 772049afe166..210df6a9104f 100644
--- a/drivers/usb/gadget/udc/mv_u3d_core.c
+++ b/drivers/usb/gadget/udc/mv_u3d_core.c
@@ -4,6 +4,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/udc/mv_udc.h b/drivers/usb/gadget/udc/mv_udc.h
index be77f207dbaf..edee032980fd 100644
--- a/drivers/usb/gadget/udc/mv_udc.h
+++ b/drivers/usb/gadget/udc/mv_udc.h
@@ -5,6 +5,8 @@ 
  * 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+
  */
 
 #ifndef __MV_UDC_H
diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index 4103bf7cf52a..8b241c4317ca 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/udc/net2272.c b/drivers/usb/gadget/udc/net2272.c
index 8f85a51bd2b3..bf38b355fb84 100644
--- a/drivers/usb/gadget/udc/net2272.c
+++ b/drivers/usb/gadget/udc/net2272.c
@@ -17,6 +17,8 @@ 
  * 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
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/udc/net2272.h b/drivers/usb/gadget/udc/net2272.h
index 69bc9c3c6ce4..0839f07dc5aa 100644
--- a/drivers/usb/gadget/udc/net2272.h
+++ b/drivers/usb/gadget/udc/net2272.h
@@ -17,6 +17,8 @@ 
  * 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
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __NET2272_H__
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index f608c1f85e61..ce277556c54d 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -19,6 +19,8 @@ 
  *
  * Note that almost all the errata workarounds here are only needed for
  * rev1 chips.  Rev1a silicon (0110) fixes almost all of them.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/net2280.h b/drivers/usb/gadget/udc/net2280.h
index 1088c3745999..64e3a188d6ef 100644
--- a/drivers/usb/gadget/udc/net2280.h
+++ b/drivers/usb/gadget/udc/net2280.h
@@ -1,6 +1,8 @@ 
 /*
  * NetChip 2280 high/full speed USB device controller.
  * Unlike many such controllers, this one talks PCI.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index f05ba6825bfe..e84efb073a9e 100644
--- a/drivers/usb/gadget/udc/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
@@ -10,6 +10,8 @@ 
  * 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+
  */
 
 #undef	DEBUG
diff --git a/drivers/usb/gadget/udc/omap_udc.h b/drivers/usb/gadget/udc/omap_udc.h
index 26974196cf44..c34a5fe18a68 100644
--- a/drivers/usb/gadget/udc/omap_udc.h
+++ b/drivers/usb/gadget/udc/omap_udc.h
@@ -3,6 +3,8 @@ 
  *
  * 2004 (C) Texas Instruments, Inc.
  * 2004 (C) David Brownell
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/pch_udc.c b/drivers/usb/gadget/udc/pch_udc.c
index 84dcbcd756f0..f7fd83a349d7 100644
--- a/drivers/usb/gadget/udc/pch_udc.c
+++ b/drivers/usb/gadget/udc/pch_udc.c
@@ -4,6 +4,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/pxa25x_udc.c b/drivers/usb/gadget/udc/pxa25x_udc.c
index 974b778e033c..c5900d305699 100644
--- a/drivers/usb/gadget/udc/pxa25x_udc.c
+++ b/drivers/usb/gadget/udc/pxa25x_udc.c
@@ -11,6 +11,8 @@ 
  * 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+
  */
 
 /* #define VERBOSE_DEBUG */
diff --git a/drivers/usb/gadget/udc/pxa25x_udc.h b/drivers/usb/gadget/udc/pxa25x_udc.h
index a458bec2536d..f46c52bc53ca 100644
--- a/drivers/usb/gadget/udc/pxa25x_udc.h
+++ b/drivers/usb/gadget/udc/pxa25x_udc.h
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 #ifndef __LINUX_USB_GADGET_PXA25X_H
diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index d48e239660c3..311400c7f9ee 100644
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/pxa27x_udc.h b/drivers/usb/gadget/udc/pxa27x_udc.h
index cea2cb79b30c..b9c3f765a675 100644
--- a/drivers/usb/gadget/udc/pxa27x_udc.h
+++ b/drivers/usb/gadget/udc/pxa27x_udc.h
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 #ifndef __LINUX_USB_GADGET_PXA27X_H
diff --git a/drivers/usb/gadget/udc/r8a66597-udc.c b/drivers/usb/gadget/udc/r8a66597-udc.c
index bb844b94df10..18916fd1504c 100644
--- a/drivers/usb/gadget/udc/r8a66597-udc.c
+++ b/drivers/usb/gadget/udc/r8a66597-udc.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/gadget/udc/r8a66597-udc.h b/drivers/usb/gadget/udc/r8a66597-udc.h
index 45c4b2df1785..9a269f91e6f9 100644
--- a/drivers/usb/gadget/udc/r8a66597-udc.h
+++ b/drivers/usb/gadget/udc/r8a66597-udc.h
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __R8A66597_H__
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index 63a206122058..37c39e45ee84 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/debugfs.h>
diff --git a/drivers/usb/gadget/udc/s3c-hsudc.c b/drivers/usb/gadget/udc/s3c-hsudc.c
index 42587b738a1f..8e44793a6a99 100644
--- a/drivers/usb/gadget/udc/s3c-hsudc.c
+++ b/drivers/usb/gadget/udc/s3c-hsudc.c
@@ -12,6 +12,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
 */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/udc/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c
index 394abd5d65c0..7184b3dd28f6 100644
--- a/drivers/usb/gadget/udc/s3c2410_udc.c
+++ b/drivers/usb/gadget/udc/s3c2410_udc.c
@@ -10,6 +10,8 @@ 
  * 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+
  */
 
 #define pr_fmt(fmt) "s3c2410_udc: " fmt
diff --git a/drivers/usb/gadget/udc/s3c2410_udc.h b/drivers/usb/gadget/udc/s3c2410_udc.h
index 93bf225f1969..a31af6281a7a 100644
--- a/drivers/usb/gadget/udc/s3c2410_udc.h
+++ b/drivers/usb/gadget/udc/s3c2410_udc.h
@@ -9,6 +9,8 @@ 
  * 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+
  */
 
 #ifndef _S3C2410_UDC_H
diff --git a/drivers/usb/gadget/udc/snps_udc_core.c b/drivers/usb/gadget/udc/snps_udc_core.c
index 2f5e788dd978..7a64d4614117 100644
--- a/drivers/usb/gadget/udc/snps_udc_core.c
+++ b/drivers/usb/gadget/udc/snps_udc_core.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 /*
diff --git a/drivers/usb/gadget/udc/snps_udc_plat.c b/drivers/usb/gadget/udc/snps_udc_plat.c
index e8a5fdaee37d..4b36683f24a9 100644
--- a/drivers/usb/gadget/udc/snps_udc_plat.c
+++ b/drivers/usb/gadget/udc/snps_udc_plat.c
@@ -11,6 +11,8 @@ 
  * kind, whether express or implied; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/extcon.h>
diff --git a/drivers/usb/gadget/udc/trace.c b/drivers/usb/gadget/udc/trace.c
index 8c551ab91ad8..1ba3a2e76f6d 100644
--- a/drivers/usb/gadget/udc/trace.c
+++ b/drivers/usb/gadget/udc/trace.c
@@ -12,6 +12,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #define CREATE_TRACE_POINTS
diff --git a/drivers/usb/gadget/udc/trace.h b/drivers/usb/gadget/udc/trace.h
index da29874b5366..cedfcb9f9f88 100644
--- a/drivers/usb/gadget/udc/trace.h
+++ b/drivers/usb/gadget/udc/trace.h
@@ -15,6 +15,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #undef TRACE_SYSTEM
diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c
index de207a90571e..8a6ff5208d21 100644
--- a/drivers/usb/gadget/udc/udc-xilinx.c
+++ b/drivers/usb/gadget/udc/udc-xilinx.c
@@ -14,6 +14,8 @@ 
  * 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+
  */
 
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 73a4dfba0edb..e53d9c7b4c77 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -5,6 +5,8 @@ 
  * it under the terms of the GNU Lesser General Public License as published
  * by the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
+ *
+ * SPDX-License-Identifier: LGPL-2.1+
  */
 
 #include <linux/errno.h>
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index b2a7f058cccb..e8428878d368 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -1,6 +1,7 @@ 
 #
 # Makefile for USB Host Controller Drivers
 #
+# SPDX-License-Identifier: GPL-2.0
 
 # tell define_trace.h where to find the xhci trace header
 CFLAGS_xhci-trace.o := -I$(src)
diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
index 5f425c89faf1..91ca4c8a7a0d 100644
--- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c
@@ -18,6 +18,8 @@ 
  * Copyright 2005-2011 Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/bcma/bcma.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 2a8b9bdc0e57..259192de56ac 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -9,6 +9,8 @@ 
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file COPYING in the main directory of this archive for
  * more details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index cbb9b8e12c3c..5f1381048e42 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -11,6 +11,8 @@ 
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 26b641100639..deca2ac0b072 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -10,6 +10,8 @@ 
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index d025cc06dda7..e67a748c84a5 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -21,6 +21,8 @@ 
  * Power Management support by Dave Liu <daveliu@freescale.com>,
  * Jerry Huang <Chang-Ming.Huang@freescale.com> and
  * Anton Vorontsov <avorontsov@ru.mvista.com>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
index 1a8a60a57cf2..7c1c9598808f 100644
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #ifndef _EHCI_FSL_H
 #define _EHCI_FSL_H
diff --git a/drivers/usb/host/ehci-grlib.c b/drivers/usb/host/ehci-grlib.c
index 21650044b09e..be34170bf7a9 100644
--- a/drivers/usb/host/ehci-grlib.c
+++ b/drivers/usb/host/ehci-grlib.c
@@ -23,6 +23,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/err.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 6e834b83a104..9de0c90ca611 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -18,6 +18,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index df169c8e7225..f7392c82bc62 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -14,6 +14,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c
index 9b7e63977215..965110830085 100644
--- a/drivers/usb/host/ehci-mem.c
+++ b/drivers/usb/host/ehci-mem.c
@@ -14,6 +14,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 2f8d3af811ce..330549f13e56 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -20,6 +20,8 @@ 
  * 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, you can find it at http://www.fsf.org
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 849806a75f1c..e1978e93743f 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index c7a9b31eeaef..8d68f28ae0c0 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -15,6 +15,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 4d308533bc83..c66c49203e7b 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -29,6 +29,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 1aec87ec68df..5ff75224fdfb 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -6,6 +6,8 @@ 
  * This file is licensed under  the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 93326974ff4b..920a0faaa10a 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -16,6 +16,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index f1908ea9fbd8..89e0a87c7bfa 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -18,6 +18,8 @@ 
  * Copyright 1999 Gregory P. Smith
  *
  * Licensed under the GNU/GPL. See COPYING for details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/acpi.h>
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-pmcmsp.c b/drivers/usb/host/ehci-pmcmsp.c
index 342816a7f8b1..20ffce58ccab 100644
--- a/drivers/usb/host/ehci-pmcmsp.c
+++ b/drivers/usb/host/ehci-pmcmsp.c
@@ -7,6 +7,8 @@ 
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /* includes */
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 1a10c8d542ca..abfa2f4d4cc4 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -10,6 +10,8 @@ 
  * and "ohci-ppc-of.c" by Sylvain Munaut <tnt@246tNt.com>
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/err.h>
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 7934ff9b35e1..a6b18ae9d6a3 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -16,6 +16,8 @@ 
  *  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
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <asm/firmware.h>
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 8f3f055c05fa..8d569f034ab6 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -14,6 +14,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 6bc6304672bc..f526541b52e9 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -15,6 +15,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
index 5caf88d679e4..1b00bc8c6956 100644
--- a/drivers/usb/host/ehci-sh.c
+++ b/drivers/usb/host/ehci-sh.c
@@ -8,6 +8,8 @@ 
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/platform_device.h>
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c
index 1f25c7985f5b..d776e5caf009 100644
--- a/drivers/usb/host/ehci-spear.c
+++ b/drivers/usb/host/ehci-spear.c
@@ -9,6 +9,8 @@ 
 * This file is subject to the terms and conditions of the GNU General Public
 * License. See the file COPYING in the main directory of this archive for
 * more details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
 */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c
index be4a2788fc58..d9c67c2c7588 100644
--- a/drivers/usb/host/ehci-st.c
+++ b/drivers/usb/host/ehci-st.c
@@ -10,6 +10,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-sysfs.c b/drivers/usb/host/ehci-sysfs.c
index 5216f2b09d63..9cf9e5032598 100644
--- a/drivers/usb/host/ehci-sysfs.c
+++ b/drivers/usb/host/ehci-sysfs.c
@@ -14,6 +14,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* this file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 9a3d7db5be57..72e7d97825de 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -14,6 +14,8 @@ 
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ehci-tilegx.c b/drivers/usb/host/ehci-tilegx.c
index bdb93b6a356f..cb723941c261 100644
--- a/drivers/usb/host/ehci-tilegx.c
+++ b/drivers/usb/host/ehci-tilegx.c
@@ -10,6 +10,8 @@ 
  *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
  *   NON INFRINGEMENT.  See the GNU General Public License for
  *   more details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/host/ehci-timer.c b/drivers/usb/host/ehci-timer.c
index 0b6cdb723192..39d09824216d 100644
--- a/drivers/usb/host/ehci-timer.c
+++ b/drivers/usb/host/ehci-timer.c
@@ -10,6 +10,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* This file is part of ehci-hcd.c */
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
index 63b9d0c67963..6bc919797e75 100644
--- a/drivers/usb/host/ehci-w90x900.c
+++ b/drivers/usb/host/ehci-w90x900.c
@@ -9,6 +9,8 @@ 
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation;version 2 of the License.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index f54480850bb8..0871eab47fb2 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -23,6 +23,8 @@ 
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/err.h>
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index a8e36170d8b8..a9974c9f9227 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -14,6 +14,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __LINUX_EHCI_HCD_H
diff --git a/drivers/usb/host/fhci-dbg.c b/drivers/usb/host/fhci-dbg.c
index b58e7a60913a..7dcb03f3ed56 100644
--- a/drivers/usb/host/fhci-dbg.c
+++ b/drivers/usb/host/fhci-dbg.c
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 55a0ae6f2d74..c116af7f322d 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/host/fhci-hub.c b/drivers/usb/host/fhci-hub.c
index 60d55eb3de0d..f65bb6cc81a4 100644
--- a/drivers/usb/host/fhci-hub.c
+++ b/drivers/usb/host/fhci-hub.c
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-mem.c b/drivers/usb/host/fhci-mem.c
index b0b88f57a5ac..bcac5193837e 100644
--- a/drivers/usb/host/fhci-mem.c
+++ b/drivers/usb/host/fhci-mem.c
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-q.c b/drivers/usb/host/fhci-q.c
index 03be7494a476..0286262f868e 100644
--- a/drivers/usb/host/fhci-q.c
+++ b/drivers/usb/host/fhci-q.c
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c
index 2f162faabbca..6832699b73ca 100644
--- a/drivers/usb/host/fhci-sched.c
+++ b/drivers/usb/host/fhci-sched.c
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c
index f82ad5df1b0d..1256bcd40bdf 100644
--- a/drivers/usb/host/fhci-tds.c
+++ b/drivers/usb/host/fhci-tds.c
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h
index 3fc82c1c3c73..a5a344034b1c 100644
--- a/drivers/usb/host/fhci.h
+++ b/drivers/usb/host/fhci.h
@@ -13,6 +13,8 @@ 
  * 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+
  */
 
 #ifndef __FHCI_H
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index 457cc6525abd..ca0ad019514d 100644
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -21,6 +21,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #include <linux/module.h>
 #include <linux/device.h>
diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h
index b5cfa7aeb277..e30c4c18e51f 100644
--- a/drivers/usb/host/fotg210.h
+++ b/drivers/usb/host/fotg210.h
@@ -1,5 +1,6 @@ 
 #ifndef __LINUX_FOTG210_H
 #define __LINUX_FOTG210_H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/usb/ehci-dbgp.h>
 
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index ba557cdba8ef..5238f4a00993 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
index da3b18038d23..159e17fcf8c2 100644
--- a/drivers/usb/host/hwa-hc.c
+++ b/drivers/usb/host/hwa-hc.c
@@ -52,6 +52,8 @@ 
  *   [__]hwahc_op_*()   Host-Wire-Adaptor specific functions for
  *                      starting/stopping/etc (some might be made also
  *                      DWA).
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/host/imx21-dbg.c b/drivers/usb/host/imx21-dbg.c
index 4f320d050da7..88e2faaa9e14 100644
--- a/drivers/usb/host/imx21-dbg.c
+++ b/drivers/usb/host/imx21-dbg.c
@@ -14,6 +14,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* this file is part of imx21-hcd.c */
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index 39ae7fb64b6f..c42294c63e41 100644
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -19,6 +19,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 
diff --git a/drivers/usb/host/imx21-hcd.h b/drivers/usb/host/imx21-hcd.h
index 05122f8a6983..0244c3dfab9b 100644
--- a/drivers/usb/host/imx21-hcd.h
+++ b/drivers/usb/host/imx21-hcd.h
@@ -19,6 +19,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __LINUX_IMX21_HCD_H__
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 73fec38754f9..c2a31275858c 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -11,6 +11,8 @@ 
  * Periodic scheduling is based on Roman's OHCI code
  * Copyright (C) 1999 Roman Weissgaerber
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/host/isp116x.h b/drivers/usb/host/isp116x.h
index dd34b7a33965..83fa587ff482 100644
--- a/drivers/usb/host/isp116x.h
+++ b/drivers/usb/host/isp116x.h
@@ -6,6 +6,8 @@ 
  * Copyright (C) 2004 Lothar Wassmann
  * Copyright (C) 2004 Psion Teklogix
  * Copyright (C) 2004 David Brownell
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /* us of 1ms frame */
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 9b7e307e2d54..dca8c06a3dec 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -9,6 +9,8 @@ 
  * Portions:
  * Copyright (C) 2004 Psion Teklogix (for NetBook PRO)
  * Copyright (C) 2004 David Brownell
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h
index 3b0b4847c3a9..1a6c718b3b2f 100644
--- a/drivers/usb/host/isp1362.h
+++ b/drivers/usb/host/isp1362.h
@@ -2,6 +2,8 @@ 
  * ISP1362 HCD (Host Controller Driver) for USB.
  *
  * COPYRIGHT (C) by L. Wassmann <LW@KARO-electronics.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /* ------------------------------------------------------------------------- */
diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
index 928a5aabee02..98ee454a1a8f 100644
--- a/drivers/usb/host/max3421-hcd.c
+++ b/drivers/usb/host/max3421-hcd.c
@@ -53,6 +53,8 @@ 
  * transactions while holding a spin-lock (and/or while interrupts are
  * masked).  To achieve this, all SPI transactions are issued from a
  * single thread (max3421_spi_thread).
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/jiffies.h>
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 5302f988e7e6..2e4e61834dfe 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -10,6 +10,8 @@ 
  * Based on ohci-omap.c
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 05da2cb59612..658519548a9d 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -9,6 +9,8 @@ 
  * This file is licensed under the terms of the GNU General Public License
  * version 2. This program is licensed "as is" without any warranty of any
  * kind, whether express or implied.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index c3eded317495..cd0fb362e678 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -5,6 +5,8 @@ 
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index 6865b919403f..bd564ce15a89 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -9,6 +9,8 @@ 
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 44924824fa41..12fd4495ad43 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -18,6 +18,8 @@ 
  * through the http://www.usb.org website.
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 248eb7702463..ce61f5126b27 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -5,6 +5,8 @@ 
  * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
  *
  * This file is licenced under GPL
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c
index ed8a762b8670..8a3876fa2c40 100644
--- a/drivers/usb/host/ohci-mem.c
+++ b/drivers/usb/host/ohci-mem.c
@@ -5,6 +5,8 @@ 
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index 6df8e2ed40fd..a07d019f9b00 100644
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -17,6 +17,8 @@ 
  * the terms of the GNU General Public License version 2. This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 91393ec7d850..5a47fe2ebfce 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -12,6 +12,8 @@ 
  * and on ohci-sa1111.c by Christopher Hoover <ch@hpl.hp.com>
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index a84aebe9b0a9..27431b6f2025 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -12,6 +12,8 @@ 
  * PCI Bus Glue
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/io.h>
diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index 61fe2b985070..27816fd83a46 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -13,6 +13,8 @@ 
  * Copyright 1999 Gregory P. Smith
  *
  * Licensed under the GNU/GPL. See COPYING for details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 4f87a5c61b08..e9b1cda7f5a3 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -11,6 +11,8 @@ 
  * Modified for of_platform bus from ohci-sa1111.c
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/signal.h>
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 71d8bc4c27f6..ede49fa050e6 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -16,6 +16,8 @@ 
  *  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
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <asm/firmware.h>
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 21c010ffb03c..e5428fd82e91 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -17,6 +17,8 @@ 
  *  by Nick Bane <nick@cecomputing.co.uk> 26-8-2004
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index 641fed609911..6cbcdd62e600 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -5,6 +5,8 @@ 
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/irq.h>
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index b006b93126f7..f5b0e872a826 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -17,6 +17,8 @@ 
  * Thanks to basprog@mail.ru for updates to newer kernels
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
 */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index 8758c73215d7..2a2b6550e67b 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -11,6 +11,8 @@ 
  * Based on fragments of previous driver by Russell King et al.
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <asm/mach-types.h>
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index d4e0f7cd96fa..72c829921335 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -9,6 +9,8 @@ 
  * SM501 Bus Glue - based on ohci-omap.c
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/interrupt.h>
diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c
index 56478ed2f932..fb83014d44d6 100644
--- a/drivers/usb/host/ohci-spear.c
+++ b/drivers/usb/host/ohci-spear.c
@@ -9,6 +9,8 @@ 
 * This file is licensed under the terms of the GNU General Public
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
+ *
+ * SPDX-License-Identifier: GPL-2.0
 */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c
index 02816a1515a1..39c8571732ae 100644
--- a/drivers/usb/host/ohci-st.c
+++ b/drivers/usb/host/ohci-st.c
@@ -10,6 +10,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/ohci-tilegx.c b/drivers/usb/host/ohci-tilegx.c
index e1b208da460a..7550de7c7bbb 100644
--- a/drivers/usb/host/ohci-tilegx.c
+++ b/drivers/usb/host/ohci-tilegx.c
@@ -10,6 +10,8 @@ 
  *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
  *   NON INFRINGEMENT.  See the GNU General Public License for
  *   more details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
index 16d081a093bb..4193f022c2d6 100644
--- a/drivers/usb/host/ohci-tmio.c
+++ b/drivers/usb/host/ohci-tmio.c
@@ -22,6 +22,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*#include <linux/fs.h>
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 12742d002d2d..de676b0ab23b 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -5,6 +5,8 @@ 
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
  *
  * This file is licenced under the GPL.
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 /*
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index ed20fb34c897..86a44fe9332f 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -18,6 +18,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/host/oxu210hp.h b/drivers/usb/host/oxu210hp.h
index 1c216ad9aad2..abcf9113e04e 100644
--- a/drivers/usb/host/oxu210hp.h
+++ b/drivers/usb/host/oxu210hp.h
@@ -1,5 +1,7 @@ 
 /*
  * Host interface registers
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #define OXU_DEVICEID			0x00
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 6dda3623a276..85994c5410ce 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -6,6 +6,8 @@ 
  *
  *  Copyright (c) 1999 Martin Mares <mj@ucw.cz>
  *  (and others)
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/types.h>
diff --git a/drivers/usb/host/pci-quirks.h b/drivers/usb/host/pci-quirks.h
index 5582cbafecd4..c0c344ec41f0 100644
--- a/drivers/usb/host/pci-quirks.h
+++ b/drivers/usb/host/pci-quirks.h
@@ -1,5 +1,6 @@ 
 #ifndef __LINUX_USB_PCI_QUIRKS_H
 #define __LINUX_USB_PCI_QUIRKS_H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifdef CONFIG_USB_PCI
 void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 5e5fc9d7d533..88944625e751 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -21,6 +21,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/host/r8a66597.h b/drivers/usb/host/r8a66597.h
index 672cea307abb..157a81ecee63 100644
--- a/drivers/usb/host/r8a66597.h
+++ b/drivers/usb/host/r8a66597.h
@@ -21,6 +21,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __R8A66597_H__
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 24ad1d6cec25..cf38fa7dac65 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -15,6 +15,8 @@ 
  * For documentation, see the SL811HS spec and the "SL811HS Embedded Host"
  * document (providing significant pieces missing from that spec); plus
  * the SL811S spec if you want peripheral side info.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/host/sl811.h b/drivers/usb/host/sl811.h
index 1e23ef49bec1..c8983c67ccf8 100644
--- a/drivers/usb/host/sl811.h
+++ b/drivers/usb/host/sl811.h
@@ -4,6 +4,8 @@ 
  * Copyright (C) 2004 Psion Teklogix
  * Copyright (C) 2004 David Brownell
  * Copyright (C) 2001 Cypress Semiconductor Inc. 
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 88a9bffe93df..b1aa7bec6abc 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -8,6 +8,8 @@ 
  *    Simon Pickering
  *
  *  Last update: 2005-05-12
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/ssb-hcd.c b/drivers/usb/host/ssb-hcd.c
index 62b6b7804c66..195760d28e3d 100644
--- a/drivers/usb/host/ssb-hcd.c
+++ b/drivers/usb/host/ssb-hcd.c
@@ -17,6 +17,8 @@ 
  * Copyright 2005-2011 Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/ssb/ssb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index c38855aed62c..fe3f76bdde11 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -34,6 +34,8 @@ 
 * an embedded CardBus slot but do not work when they are connected
 * via an ELAN U132 adapter.
 *
+ *
+ * SPDX-License-Identifier: GPL-2.0
 */
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c
index 9c6635d43db0..753b2ba074c9 100644
--- a/drivers/usb/host/uhci-debug.c
+++ b/drivers/usb/host/uhci-debug.c
@@ -7,6 +7,8 @@ 
  *
  * (C) Copyright 1999 Linus Torvalds
  * (C) Copyright 1999-2001 Johannes Erdfelt
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/slab.h>
diff --git a/drivers/usb/host/uhci-grlib.c b/drivers/usb/host/uhci-grlib.c
index 0342991c9507..35fd9925d3a6 100644
--- a/drivers/usb/host/uhci-grlib.c
+++ b/drivers/usb/host/uhci-grlib.c
@@ -15,6 +15,8 @@ 
  *               support from usb-ohci.c by Adam Richter, adam@yggdrasil.com).
  * (C) Copyright 1999 Gregory P. Smith (from usb-ohci.c)
  * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index c3267a78c94e..02ac983e18bb 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -20,6 +20,8 @@ 
  * people who decided that they want to do the same thing in a
  * completely different way.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h
index 91b22b2ea3aa..c087e62a0d69 100644
--- a/drivers/usb/host/uhci-hcd.h
+++ b/drivers/usb/host/uhci-hcd.h
@@ -1,5 +1,6 @@ 
 #ifndef __LINUX_UHCI_HCD_H
 #define __LINUX_UHCI_HCD_H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/list.h>
 #include <linux/usb.h>
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index ece9e37e89fe..32d2c0854835 100644
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -10,6 +10,8 @@ 
  * (C) Copyright 1999 Deti Fliegl, deti@fliegl.de
  * (C) Copyright 1999 Thomas Sailer, sailer@ife.ee.ethz.ch
  * (C) Copyright 2004 Alan Stern, stern@rowland.harvard.edu
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 static const __u8 root_hub_hub_des[] =
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c
index 49effdc0d857..744fa653d6bb 100644
--- a/drivers/usb/host/uhci-pci.c
+++ b/drivers/usb/host/uhci-pci.c
@@ -15,6 +15,8 @@ 
  *               support from usb-ohci.c by Adam Richter, adam@yggdrasil.com).
  * (C) Copyright 1999 Gregory P. Smith (from usb-ohci.c)
  * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include "pci-quirks.h"
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
index 1b4e086c33a0..0ab2a9f87a5f 100644
--- a/drivers/usb/host/uhci-platform.c
+++ b/drivers/usb/host/uhci-platform.c
@@ -5,6 +5,8 @@ 
  *
  * This file is based on uhci-grlib.c
  * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/of.h>
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index c17ea1589b83..22e1d3ef9a22 100644
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -14,6 +14,8 @@ 
  *               support from usb-ohci.c by Adam Richter, adam@yggdrasil.com).
  * (C) Copyright 1999 Gregory P. Smith (from usb-ohci.c)
  * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 
diff --git a/drivers/usb/host/whci/asl.c b/drivers/usb/host/whci/asl.c
index 773249306031..fecc93117ca0 100644
--- a/drivers/usb/host/whci/asl.c
+++ b/drivers/usb/host/whci/asl.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/gfp.h>
diff --git a/drivers/usb/host/whci/debug.c b/drivers/usb/host/whci/debug.c
index 774b89d28fae..d0a4b219c278 100644
--- a/drivers/usb/host/whci/debug.c
+++ b/drivers/usb/host/whci/debug.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/slab.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/whci/hcd.c b/drivers/usb/host/whci/hcd.c
index cf84269c3e6d..09d396618de7 100644
--- a/drivers/usb/host/whci/hcd.c
+++ b/drivers/usb/host/whci/hcd.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/usb/host/whci/hw.c b/drivers/usb/host/whci/hw.c
index 6afa2e379160..79b39c227fbd 100644
--- a/drivers/usb/host/whci/hw.c
+++ b/drivers/usb/host/whci/hw.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/host/whci/init.c b/drivers/usb/host/whci/init.c
index ad8eb575c30a..7f624dbbfbeb 100644
--- a/drivers/usb/host/whci/init.c
+++ b/drivers/usb/host/whci/init.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/gfp.h>
diff --git a/drivers/usb/host/whci/int.c b/drivers/usb/host/whci/int.c
index 0c086b2790d1..d33de4cc095c 100644
--- a/drivers/usb/host/whci/int.c
+++ b/drivers/usb/host/whci/int.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/uwb/umc.h>
diff --git a/drivers/usb/host/whci/pzl.c b/drivers/usb/host/whci/pzl.c
index 33c5580b4d25..0b0d2e658949 100644
--- a/drivers/usb/host/whci/pzl.c
+++ b/drivers/usb/host/whci/pzl.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/gfp.h>
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c
index c0e6812426b3..31177cd99bbf 100644
--- a/drivers/usb/host/whci/qset.c
+++ b/drivers/usb/host/whci/qset.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/host/whci/whcd.h b/drivers/usb/host/whci/whcd.h
index c80c7d93bc4a..b301088179df 100644
--- a/drivers/usb/host/whci/whcd.h
+++ b/drivers/usb/host/whci/whcd.h
@@ -16,6 +16,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #ifndef __WHCD_H
 #define __WHCD_H
diff --git a/drivers/usb/host/whci/whci-hc.h b/drivers/usb/host/whci/whci-hc.h
index 4d4cbc0730bf..918eda75dbfe 100644
--- a/drivers/usb/host/whci/whci-hc.h
+++ b/drivers/usb/host/whci/whci-hc.h
@@ -16,6 +16,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #ifndef _WHCI_WHCI_HC_H
 #define _WHCI_WHCI_HC_H
diff --git a/drivers/usb/host/whci/wusb.c b/drivers/usb/host/whci/wusb.c
index 8d2762682869..d360c5c02955 100644
--- a/drivers/usb/host/whci/wusb.c
+++ b/drivers/usb/host/whci/wusb.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/uwb/umc.h>
diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
index 2c83b37ae8f2..658fe0278411 100644
--- a/drivers/usb/host/xhci-dbg.c
+++ b/drivers/usb/host/xhci-dbg.c
@@ -18,6 +18,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include "xhci.h"
diff --git a/drivers/usb/host/xhci-ext-caps.h b/drivers/usb/host/xhci-ext-caps.h
index 28deea584884..ee327abb13d1 100644
--- a/drivers/usb/host/xhci-ext-caps.h
+++ b/drivers/usb/host/xhci-ext-caps.h
@@ -18,6 +18,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 /* Up to 16 ms to halt an HC */
 #define XHCI_MAX_HALT_USEC	(16*1000)
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index f070f94a8022..1edf5e23b5c4 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -18,6 +18,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 795219a397d3..02323c26ec03 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -18,6 +18,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/usb.h>
diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c
index 6e7ddf6cafae..5a61ec09f5d5 100644
--- a/drivers/usb/host/xhci-mtk-sch.c
+++ b/drivers/usb/host/xhci-mtk-sch.c
@@ -13,6 +13,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 8fb60657ed4f..3aaa1eabd299 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h
index 3aa5e1d25064..129edcd15c6a 100644
--- a/drivers/usb/host/xhci-mtk.h
+++ b/drivers/usb/host/xhci-mtk.h
@@ -13,6 +13,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _XHCI_MTK_H_
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index 85908a3ecb8f..95cca2a84015 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -5,6 +5,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/io.h>
diff --git a/drivers/usb/host/xhci-mvebu.h b/drivers/usb/host/xhci-mvebu.h
index 301fc984cae6..090ef352642b 100644
--- a/drivers/usb/host/xhci-mvebu.h
+++ b/drivers/usb/host/xhci-mvebu.h
@@ -6,6 +6,8 @@ 
  * This file is licensed under the terms of the GNU General Public
  * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __LINUX_XHCI_MVEBU_H
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 76f392954733..69bba82946a8 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -18,6 +18,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/pci.h>
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 1969e56a8d8d..5cb662c78680 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -9,6 +9,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h
index 29b227895b07..b8debe5552dc 100644
--- a/drivers/usb/host/xhci-plat.h
+++ b/drivers/usb/host/xhci-plat.h
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _XHCI_PLAT_H
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 198bc188ab25..00d2483f828b 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/firmware.h>
diff --git a/drivers/usb/host/xhci-rcar.h b/drivers/usb/host/xhci-rcar.h
index d247951147a1..787116bbd0bb 100644
--- a/drivers/usb/host/xhci-rcar.h
+++ b/drivers/usb/host/xhci-rcar.h
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _XHCI_RCAR_H
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index e35eed16c842..75344e1e5ec0 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -18,6 +18,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index 74436f8ca538..a9e01cff41f4 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -7,6 +7,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/host/xhci-trace.c b/drivers/usb/host/xhci-trace.c
index 367b630bdb3c..d7edf9ed5f5b 100644
--- a/drivers/usb/host/xhci-trace.c
+++ b/drivers/usb/host/xhci-trace.c
@@ -9,6 +9,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #define CREATE_TRACE_POINTS
diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h
index 754dfb0e1a02..1d1dc0a05739 100644
--- a/drivers/usb/host/xhci-trace.h
+++ b/drivers/usb/host/xhci-trace.h
@@ -9,6 +9,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #undef TRACE_SYSTEM
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 21dd1d98508f..73086bd8dccd 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -18,6 +18,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/pci.h>
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 86df906aec46..fea8025822eb 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -19,6 +19,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __LINUX_XHCI_HCD_H
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index e92540a21b6b..8e97bd8bf845 100644
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -14,6 +14,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 0b21ba757bba..7a5874a41155 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -117,6 +117,8 @@ 
  *	20010320 Version 0.4.3
  *	20010408 Identify version on module load.
  *	20011003 Fix multiple requests
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
index bfa402cf3a27..690aff94c04c 100644
--- a/drivers/usb/isp1760/isp1760-core.c
+++ b/drivers/usb/isp1760/isp1760-core.c
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/delay.h>
diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
index c70f8368a794..e655599d76ea 100644
--- a/drivers/usb/isp1760/isp1760-core.h
+++ b/drivers/usb/isp1760/isp1760-core.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _ISP1760_CORE_H_
diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
index 8e59e0c02b8a..564af2c494e9 100644
--- a/drivers/usb/isp1760/isp1760-hcd.c
+++ b/drivers/usb/isp1760/isp1760-hcd.c
@@ -10,6 +10,8 @@ 
  *
  * (c) 2011 Arvid Brodin <arvid.brodin@enea.com>
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
index 0c1c98d6ea08..e82c9c000d41 100644
--- a/drivers/usb/isp1760/isp1760-hcd.h
+++ b/drivers/usb/isp1760/isp1760-hcd.h
@@ -1,5 +1,6 @@ 
 #ifndef _ISP1760_HCD_H_
 #define _ISP1760_HCD_H_
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/spinlock.h>
 
diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index bc68bbab7fa1..50fe35cd5ac7 100644
--- a/drivers/usb/isp1760/isp1760-if.c
+++ b/drivers/usb/isp1760/isp1760-if.c
@@ -7,6 +7,8 @@ 
  *
  * (c) 2007 Sebastian Siewior <bigeasy@linutronix.de>
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/usb.h>
diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
index b67095c9a9d4..0e0f2c0ae38f 100644
--- a/drivers/usb/isp1760/isp1760-regs.h
+++ b/drivers/usb/isp1760/isp1760-regs.h
@@ -11,6 +11,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _ISP1760_REGS_H_
diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
index 69400f3da886..613907f0436e 100644
--- a/drivers/usb/isp1760/isp1760-udc.c
+++ b/drivers/usb/isp1760/isp1760-udc.c
@@ -9,6 +9,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/interrupt.h>
diff --git a/drivers/usb/isp1760/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
index 26899ed81145..bde9c14b3996 100644
--- a/drivers/usb/isp1760/isp1760-udc.h
+++ b/drivers/usb/isp1760/isp1760-udc.h
@@ -9,6 +9,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _ISP1760_UDC_H_
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 7fdb45fc976f..4d294a5eb439 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -2,6 +2,7 @@ 
 # Makefile for the rest of the USB drivers
 # (the ones that don't fit into any other categories)
 #
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_ADUTUX)		+= adutux.o
 obj-$(CONFIG_USB_APPLEDISPLAY)		+= appledisplay.o
 obj-$(CONFIG_USB_CYPRESS_CY7C63)	+= cypress_cy7c63.o
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 1c0ada75c35d..ebc41a083de5 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -16,6 +16,8 @@ 
  * that was derived from USB Skeleton driver - 0.5
  * Copyright (c) 2001 Greg Kroah-Hartman (greg@kroah.com)
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index 8efdc500e790..320d09349556 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -18,6 +18,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c
index abec6e604a62..c47ca62d884d 100644
--- a/drivers/usb/misc/chaoskey.c
+++ b/drivers/usb/misc/chaoskey.c
@@ -20,6 +20,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c
index 5c93a888c40e..3edb7f26f984 100644
--- a/drivers/usb/misc/cypress_cy7c63.c
+++ b/drivers/usb/misc/cypress_cy7c63.c
@@ -27,6 +27,8 @@ 
 *	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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
 */
 
 #include <linux/module.h>
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index 63207c42acf6..c5c2d46ee0a9 100644
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -11,6 +11,8 @@ 
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, version 2.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 
diff --git a/drivers/usb/misc/ehset.c b/drivers/usb/misc/ehset.c
index c31b4a33e6bb..00af779045d1 100644
--- a/drivers/usb/misc/ehset.c
+++ b/drivers/usb/misc/ehset.c
@@ -9,6 +9,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index 8950fa5e973d..19dbf1261e6f 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -8,6 +8,8 @@ 
  * the Free Software Foundation, version 2.
  * 
  * emi26.c,v 1.13 2002/03/08 13:10:26 tapio Exp
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index 1d9be4431b72..b570035d8dc2 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/misc/ezusb.c b/drivers/usb/misc/ezusb.c
index 837208f14f86..2b79aeede464 100644
--- a/drivers/usb/misc/ezusb.c
+++ b/drivers/usb/misc/ezusb.c
@@ -6,6 +6,8 @@ 
  *	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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 424ff12f3b51..0822936b73f8 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -34,6 +34,8 @@ 
  * an embedded CardBus slot but do not work when they are connected
  * via an ELAN U132 adapter.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index 39d8fedfaf3b..cb1b66c425e2 100644
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -14,6 +14,8 @@ 
   Additional information provided by Martin Reising
   <Martin.Reising@natural-computing.de>
 
+
+ SPDX-License-Identifier: GPL-2.0+
 */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index be5881303681..c18dcdb8e31e 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -11,6 +11,8 @@ 
  *           and St�hane Doyon   <s.doyon@videotron.ca>
  *
  *  Released under the GPLv2.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c
index 1c61830e96f9..d44b1aa9e99a 100644
--- a/drivers/usb/misc/isight_firmware.c
+++ b/drivers/usb/misc/isight_firmware.c
@@ -19,6 +19,8 @@ 
  * The isight firmware loading was reverse engineered by Johannes Berg
  * <johannes@sipsolutions.de>, and this driver is based on code by Ronald
  * Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/usb.h>
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 680bddb3ce05..90076cb131f5 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -20,6 +20,8 @@ 
  * Derived from Lego USB Tower driver
  * Copyright (C) 2003 David Glance <advidgsf@sourceforge.net>
  *		 2001-2004 Juergen Stuber <starblue@users.sourceforge.net>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 5628f678ab59..0ba56f8974e6 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -73,6 +73,8 @@ 
  *   - check for valid udev on resubmitting and unlinking urbs
  * 2004-08-03 - 0.96 Juergen Stuber <starblue@users.sourceforge.net>
  *   - move reset into open to clean out spurious data
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/usb/misc/lvstest.c b/drivers/usb/misc/lvstest.c
index ddddd6387f66..622742a0750b 100644
--- a/drivers/usb/misc/lvstest.c
+++ b/drivers/usb/misc/lvstest.c
@@ -9,6 +9,8 @@ 
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/init.h>
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index ddfebb144aaa..ac5e841de363 100644
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -1,4 +1,8 @@ 
-/* -*- linux-c -*- */
+/*
+ * -*- linux-c -*-
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
 
 /* 
  * Driver for USB Rio 500
diff --git a/drivers/usb/misc/rio500_usb.h b/drivers/usb/misc/rio500_usb.h
index 359abc98e706..a09f9a693ee4 100644
--- a/drivers/usb/misc/rio500_usb.h
+++ b/drivers/usb/misc/rio500_usb.h
@@ -16,6 +16,7 @@ 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+ * SPDX-License-Identifier: GPL-2.0+
     ---------------------------------------------------------------------- */
 
 
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 30774e0aeadd..822bae3c86ae 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -34,6 +34,8 @@ 
  *
  * Author:	Thomas Winischhofer <thomas@winischhofer.net>
  *
+ *
+ * SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
  */
 
 #include <linux/mutex.h>
diff --git a/drivers/usb/misc/sisusbvga/sisusb.h b/drivers/usb/misc/sisusbvga/sisusb.h
index 55492a5930bd..e33dd98987ed 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.h
+++ b/drivers/usb/misc/sisusbvga/sisusb.h
@@ -32,6 +32,8 @@ 
  *
  * Author:	Thomas Winischhofer <thomas@winischhofer.net>
  *
+ *
+ * SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
  */
 
 #ifndef _SISUSB_H_
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c
index f019d80ca9e4..e4f4480dae84 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_con.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_con.c
@@ -45,6 +45,8 @@ 
  * nature. For now, this driver just ignores any calls if it
  * detects this state.
  *
+ *
+ * SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
  */
 
 #include <linux/mutex.h>
diff --git a/drivers/usb/misc/sisusbvga/sisusb_init.c b/drivers/usb/misc/sisusbvga/sisusb_init.c
index bf0032ca35ed..572e09171709 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_init.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_init.c
@@ -34,6 +34,8 @@ 
  *
  * Author:	Thomas Winischhofer <thomas@winischhofer.net>
  *
+ *
+ * SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/misc/sisusbvga/sisusb_init.h b/drivers/usb/misc/sisusbvga/sisusb_init.h
index e79a616f0d26..d34ed1d3dbbe 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_init.h
+++ b/drivers/usb/misc/sisusbvga/sisusb_init.h
@@ -1,4 +1,8 @@ 
-/* $XFree86$ */
+/*
+ * $XFree86$
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+ */
 /* $XdotOrg$ */
 /*
  * Data and prototypes for init.c
diff --git a/drivers/usb/misc/sisusbvga/sisusb_struct.h b/drivers/usb/misc/sisusbvga/sisusb_struct.h
index 1c4240e802c1..3af6211a8a82 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_struct.h
+++ b/drivers/usb/misc/sisusbvga/sisusb_struct.h
@@ -46,6 +46,8 @@ 
  *
  * Author:	Thomas Winischhofer <thomas@winischhofer.net>
  *
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  */
 
 #ifndef _SISUSB_STRUCT_H_
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
index 1862ed15ce28..8d181a687dae 100644
--- a/drivers/usb/misc/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
@@ -16,6 +16,8 @@ 
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* Standard include files */
diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 135c91c434bf..f6ec82a0764a 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -17,6 +17,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/delay.h>
diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c
index 8e7737d7ac0a..700cfd448f3a 100644
--- a/drivers/usb/misc/usb3503.c
+++ b/drivers/usb/misc/usb3503.c
@@ -16,6 +16,8 @@ 
  * 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
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/misc/usb4604.c b/drivers/usb/misc/usb4604.c
index e9f37fb746ac..d29cd224c26d 100644
--- a/drivers/usb/misc/usb4604.c
+++ b/drivers/usb/misc/usb4604.c
@@ -14,6 +14,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/i2c.h>
diff --git a/drivers/usb/misc/usb_u132.h b/drivers/usb/misc/usb_u132.h
index dc2e5a31caec..59f1615c52fc 100644
--- a/drivers/usb/misc/usb_u132.h
+++ b/drivers/usb/misc/usb_u132.h
@@ -57,6 +57,8 @@ 
 * module code will run in the context of one of the kernel threads
 * of the "ftdi-u132" module.
 *
+ *
+ * SPDX-License-Identifier: GPL-2.0
 */
 int ftdi_elan_switch_on_diagnostics(int number);
 void ftdi_elan_gone_away(struct platform_device *pdev);
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index 0f5ad896c7e3..1b8b87979f4b 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
@@ -11,6 +11,7 @@ 
  *          based on usb_skeleton.c.                                         *
  *          This new driver allows more than one USB-LCD to be connected     *
  *          and controlled, at once                                          *
+ * SPDX-License-Identifier: GPL-2.0
  *****************************************************************************/
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/usbsevseg.c b/drivers/usb/misc/usbsevseg.c
index 3f6a28045b53..344d4dc33ff0 100644
--- a/drivers/usb/misc/usbsevseg.c
+++ b/drivers/usb/misc/usbsevseg.c
@@ -8,6 +8,8 @@ 
  *	modify it under the terms of the GNU General Public License as
  *	published by the Free Software Foundation, version 2.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index b3fc602b2e24..fb48b4e1d7d3 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 8a13b2fcf3e1..ae0e3a9c8b67 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -1,4 +1,8 @@ 
-/*****************************************************************************/
+/*
+ * ***************************************************************************
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
 
 /*
  *	uss720.c  --  USS720 USB Parport Cable.
diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
index 58abdf28620a..845e5b7802f8 100644
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@ -7,6 +7,8 @@ 
  *	modify it under the terms of the GNU General Public License as
  *	published by the Free Software Foundation, version 2.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index b6d8bf475c92..7c6a652f854d 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -5,6 +5,8 @@ 
  *
  * Copyright (C) 2006 Paolo Abeni (paolo.abeni@email.it)
  * Copyright (C) 2006,2007 Pete Zaitcev (zaitcev@redhat.com)
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
index 46847340b819..2c56390e4519 100644
--- a/drivers/usb/mon/mon_main.c
+++ b/drivers/usb/mon/mon_main.c
@@ -4,6 +4,8 @@ 
  * mon_main.c: Main file, module initiation and exit, registrations, etc.
  *
  * Copyright (C) 2005 Pete Zaitcev (zaitcev@redhat.com)
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c
index 5bdf73a57498..a160df3fe1db 100644
--- a/drivers/usb/mon/mon_stat.c
+++ b/drivers/usb/mon/mon_stat.c
@@ -5,6 +5,8 @@ 
  * Note that this code blows through locks, so make sure that
  * /dbg/usbmon/0s is well protected from non-root users.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index 19c416d69eb9..6010e1f68357 100644
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -2,6 +2,8 @@ 
  * The USB Monitor, inspired by Dave Harding's USBMon.
  *
  * This is a text format reader.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/mon/usb_mon.h b/drivers/usb/mon/usb_mon.h
index df9a4df342c7..c2b15a22c0aa 100644
--- a/drivers/usb/mon/usb_mon.h
+++ b/drivers/usb/mon/usb_mon.h
@@ -2,6 +2,8 @@ 
  * The USB Monitor, inspired by Dave Harding's USBMon.
  *
  * Copyright (C) 2005 Pete Zaitcev (zaitcev@redhat.com)
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __USB_MON_H
diff --git a/drivers/usb/mtu3/Makefile b/drivers/usb/mtu3/Makefile
index 60e0fff7a847..4a9715812bf9 100644
--- a/drivers/usb/mtu3/Makefile
+++ b/drivers/usb/mtu3/Makefile
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: GPL-2.0
 
 ccflags-$(CONFIG_USB_MTU3_DEBUG)	+= -DDEBUG
 
diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
index b26fffc58446..9e4b8228a9a8 100644
--- a/drivers/usb/mtu3/mtu3.h
+++ b/drivers/usb/mtu3/mtu3.h
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MTU3_H__
diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c
index 99c65b0788ff..d549af76a549 100644
--- a/drivers/usb/mtu3/mtu3_core.c
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -15,6 +15,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/mtu3/mtu3_dr.c b/drivers/usb/mtu3/mtu3_dr.c
index 560256115b23..601e9ed16a58 100644
--- a/drivers/usb/mtu3/mtu3_dr.c
+++ b/drivers/usb/mtu3/mtu3_dr.c
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/debugfs.h>
diff --git a/drivers/usb/mtu3/mtu3_dr.h b/drivers/usb/mtu3/mtu3_dr.h
index 9b228b5811b0..19e6015cec2d 100644
--- a/drivers/usb/mtu3/mtu3_dr.h
+++ b/drivers/usb/mtu3/mtu3_dr.h
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _MTU3_DR_H_
diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c
index 434fca58143c..5fe8e7e3b126 100644
--- a/drivers/usb/mtu3/mtu3_gadget.c
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include "mtu3.h"
diff --git a/drivers/usb/mtu3/mtu3_gadget_ep0.c b/drivers/usb/mtu3/mtu3_gadget_ep0.c
index 958d74dd2b78..db4b9ad43e83 100644
--- a/drivers/usb/mtu3/mtu3_gadget_ep0.c
+++ b/drivers/usb/mtu3/mtu3_gadget_ep0.c
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/mtu3/mtu3_host.c b/drivers/usb/mtu3/mtu3_host.c
index e42d308b8dc2..4cea9a0eb570 100644
--- a/drivers/usb/mtu3/mtu3_host.c
+++ b/drivers/usb/mtu3/mtu3_host.c
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/mtu3/mtu3_hw_regs.h b/drivers/usb/mtu3/mtu3_hw_regs.h
index 06b29664470f..1d27ab3c1d85 100644
--- a/drivers/usb/mtu3/mtu3_hw_regs.h
+++ b/drivers/usb/mtu3/mtu3_hw_regs.h
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _SSUSB_HW_REGS_H_
diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index 088e3e685c4f..507adfc477f4 100644
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -12,6 +12,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/mtu3/mtu3_qmu.c b/drivers/usb/mtu3/mtu3_qmu.c
index 7d9ba8a52368..b8322457d10e 100644
--- a/drivers/usb/mtu3/mtu3_qmu.c
+++ b/drivers/usb/mtu3/mtu3_qmu.c
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/mtu3/mtu3_qmu.h b/drivers/usb/mtu3/mtu3_qmu.h
index 4dafa16bf120..a2e3bf754a27 100644
--- a/drivers/usb/mtu3/mtu3_qmu.h
+++ b/drivers/usb/mtu3/mtu3_qmu.h
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MTK_QMU_H__
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 689d42aba8a9..bc6f3190ac0f 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -1,6 +1,7 @@ 
 #
 # for USB OTG silicon based on Mentor Graphics INVENTRA designs
 #
+# SPDX-License-Identifier: GPL-2.0
 
 # define_trace.h needs to know how to find our header
 CFLAGS_musb_trace.o	:= -I$(src)
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 02fbb4fe3745..96d676af6f87 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -25,6 +25,8 @@ 
  * write to the Free Software Foundation, Inc., 59 Temple Place,
  * Suite 330, Boston, MA  02111-1307  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 4418574a36a1..74e3de0c6fde 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -6,6 +6,8 @@ 
  * Enter bugs at http://blackfin.uclinux.org/
  *
  * Licensed under the GPL-2 or later.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/blackfin.h b/drivers/usb/musb/blackfin.h
index c84dae546dc6..44a15d5173c6 100644
--- a/drivers/usb/musb/blackfin.h
+++ b/drivers/usb/musb/blackfin.h
@@ -5,6 +5,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MUSB_BLACKFIN_H__
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index a13bd3625043..82329beebff6 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -4,6 +4,8 @@ 
  * This file implements a DMA  interface using TI's CPPI DMA.
  * For now it's DaVinci-only, but CPPI isn't specific to DaVinci or USB.
  * The TUSB6020, using VLYNQ, has CPPI that looks much like DaVinci.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/cppi_dma.h b/drivers/usb/musb/cppi_dma.h
index 9bb7c5e45c85..f8088d382b55 100644
--- a/drivers/usb/musb/cppi_dma.h
+++ b/drivers/usb/musb/cppi_dma.h
@@ -1,4 +1,8 @@ 
-/* Copyright (C) 2005-2006 by Texas Instruments */
+/*
+ * Copyright (C) 2005-2006 by Texas Instruments
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ */
 
 #ifndef _CPPI_DMA_H_
 #define _CPPI_DMA_H_
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index df88123274ca..ac7a3d7660d0 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -27,6 +27,8 @@ 
  * write to the Free Software Foundation, Inc., 59 Temple Place,
  * Suite 330, Boston, MA  02111-1307  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 52b491d3d5d8..a74336b89347 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -19,6 +19,8 @@ 
  * write to the Free Software Foundation, Inc., 59 Temple Place,
  * Suite 330, Boston, MA  02111-1307  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h
index 371baa0ee509..5f364f7d2068 100644
--- a/drivers/usb/musb/davinci.h
+++ b/drivers/usb/musb/davinci.h
@@ -5,6 +5,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MUSB_HDRDF_H__
diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c
index 40c68c23d553..1eda5c08388d 100644
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -11,6 +11,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/musb/musb_am335x.c b/drivers/usb/musb/musb_am335x.c
index 1e58ed2361cc..cb06ed7631d9 100644
--- a/drivers/usb/musb/musb_am335x.c
+++ b/drivers/usb/musb/musb_am335x.c
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/module.h>
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 029692053dd3..c06b92efea5a 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -30,6 +30,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /*
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index c748f4ac1154..ac34aabe986f 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -30,6 +30,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MUSB_CORE_H__
diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
index ba255280a624..64001cc5fdb3 100644
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h
index 9a78877a8afe..85e07eeea27a 100644
--- a/drivers/usb/musb/musb_debug.h
+++ b/drivers/usb/musb/musb_debug.h
@@ -30,6 +30,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MUSB_LINUX_DEBUG_H__
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index 952733ceaac8..a98f8b6d63af 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -29,6 +29,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h
index 04c3bd86bd62..235034dd93bf 100644
--- a/drivers/usb/musb/musb_dma.h
+++ b/drivers/usb/musb/musb_dma.h
@@ -30,6 +30,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MUSB_DMA_H__
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index f6b526606ad1..b22b28e005e4 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -27,6 +27,8 @@ 
  * such as dm64x, dm36x, dm35x, da8x, am35x and ti81x.
  * For now only ti81x is using this and in future davinci.c, am35x.c
  * da8xx.c would be merged to this file after testing.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/io.h>
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index bc6d1717c9ec..5f4542b0298c 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -31,6 +31,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/musb/musb_gadget.h b/drivers/usb/musb/musb_gadget.h
index 0314dfc770c7..130188fa07b7 100644
--- a/drivers/usb/musb/musb_gadget.h
+++ b/drivers/usb/musb/musb_gadget.h
@@ -30,6 +30,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MUSB_GADGET_H
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 844a309fe895..0bc583ffebd3 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -31,6 +31,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index b17450a59882..9ffdb910616f 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -31,6 +31,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h
index 7bbf01bf4bb0..0d0af972d4ee 100644
--- a/drivers/usb/musb/musb_host.h
+++ b/drivers/usb/musb/musb_host.h
@@ -30,6 +30,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef _MUSB_HOST_H
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 17a80ae20674..904903403855 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -30,6 +30,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MUSB_LINUX_PLATFORM_ARCH_H__
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index cff5bcf0d00f..78f8b4e46bba 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -30,6 +30,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MUSB_REGS_H__
diff --git a/drivers/usb/musb/musb_trace.c b/drivers/usb/musb/musb_trace.c
index 70973d901a21..654c8481355b 100644
--- a/drivers/usb/musb/musb_trace.c
+++ b/drivers/usb/musb/musb_trace.c
@@ -13,6 +13,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #define CREATE_TRACE_POINTS
diff --git a/drivers/usb/musb/musb_trace.h b/drivers/usb/musb/musb_trace.h
index f031c9e74322..257dd9446b15 100644
--- a/drivers/usb/musb/musb_trace.h
+++ b/drivers/usb/musb/musb_trace.h
@@ -13,6 +13,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #undef TRACE_SYSTEM
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 0b4595439d51..b92e795c0489 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -30,6 +30,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 3620073da58c..7ffa1c6fd410 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -29,6 +29,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/device.h>
 #include <linux/interrupt.h>
diff --git a/drivers/usb/musb/musbhsdma.h b/drivers/usb/musb/musbhsdma.h
index a3dcbd55e436..d336fd2365d7 100644
--- a/drivers/usb/musb/musbhsdma.h
+++ b/drivers/usb/musb/musbhsdma.h
@@ -29,6 +29,8 @@ 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef CONFIG_BLACKFIN
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 456f3e6ecf03..66550361bc1d 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -23,6 +23,8 @@ 
  * write to the Free Software Foundation, Inc., 59 Temple Place,
  * Suite 330, Boston, MA  02111-1307  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
index 1b5e83a9840e..07104e74d009 100644
--- a/drivers/usb/musb/omap2430.h
+++ b/drivers/usb/musb/omap2430.h
@@ -5,6 +5,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __MUSB_OMAP243X_H__
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index c9a09b5bb6e5..4a5fabc2f645 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -15,6 +15,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 4eb640c54f2c..09416ae08945 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -12,6 +12,8 @@ 
  * - Driver assumes that interface to external host (main CPU) is
  *   configured for NOR FLASH interface instead of VLYNQ serial
  *   interface.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/tusb6010.h b/drivers/usb/musb/tusb6010.h
index 72cdad23ced9..11470e4803c5 100644
--- a/drivers/usb/musb/tusb6010.h
+++ b/drivers/usb/musb/tusb6010.h
@@ -7,6 +7,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __TUSB6010_H__
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index e8060e49b0f4..160db3ae165e 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -7,6 +7,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index 5a572500c418..ffcaead0ba71 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -17,6 +17,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index c92a295049ad..658dad894fda 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -22,6 +22,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index e7c9ca8cafb0..74d1e9761e34 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -1,6 +1,7 @@ 
 #
 # Makefile for physical layer USB drivers
 #
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_PHY)			+= phy.o
 obj-$(CONFIG_OF)			+= of.o
 
diff --git a/drivers/usb/phy/of.c b/drivers/usb/phy/of.c
index 66ffa82457a8..d165410c0beb 100644
--- a/drivers/usb/phy/of.c
+++ b/drivers/usb/phy/of.c
@@ -5,6 +5,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 61bf2285d5b1..a0f3494c937d 100644
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -20,6 +20,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-am335x-control.c b/drivers/usb/phy/phy-am335x-control.c
index 5f5f19813fde..9eb815c84d04 100644
--- a/drivers/usb/phy/phy-am335x-control.c
+++ b/drivers/usb/phy/phy-am335x-control.c
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
diff --git a/drivers/usb/phy/phy-am335x-control.h b/drivers/usb/phy/phy-am335x-control.h
index e86b3165d69d..ee212292de67 100644
--- a/drivers/usb/phy/phy-am335x-control.h
+++ b/drivers/usb/phy/phy-am335x-control.h
@@ -1,5 +1,6 @@ 
 #ifndef _AM335x_PHY_CONTROL_H_
 #define _AM335x_PHY_CONTROL_H_
+/* SPDX-License-Identifier: GPL-2.0 */
 
 struct phy_control {
 	void (*phy_power)(struct phy_control *phy_ctrl, u32 id,
diff --git a/drivers/usb/phy/phy-am335x.c b/drivers/usb/phy/phy-am335x.c
index 7e5aece769da..b1f0bb1bad7a 100644
--- a/drivers/usb/phy/phy-am335x.c
+++ b/drivers/usb/phy/phy-am335x.c
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index cf8f40ae6e01..459f779db61a 100644
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -19,6 +19,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-fsl-usb.h b/drivers/usb/phy/phy-fsl-usb.h
index 23149954a09c..dfed7d79c9dc 100644
--- a/drivers/usb/phy/phy-fsl-usb.h
+++ b/drivers/usb/phy/phy-fsl-usb.h
@@ -13,6 +13,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/usb/otg-fsm.h>
diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index 89d6e7a5fdb7..2e307a398b3e 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -22,6 +22,8 @@ 
  * Current status:
  *	This provides a "nop" transceiver for PHYs which are
  *	autonomous such as isp1504, isp1707, etc.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-generic.h b/drivers/usb/phy/phy-generic.h
index 0d0eadd54ed9..90d6698a5dc0 100644
--- a/drivers/usb/phy/phy-generic.h
+++ b/drivers/usb/phy/phy-generic.h
@@ -1,5 +1,6 @@ 
 #ifndef _PHY_GENERIC_H_
 #define _PHY_GENERIC_H_
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/usb/usb_phy_generic.h>
 #include <linux/gpio/consumer.h>
diff --git a/drivers/usb/phy/phy-gpio-vbus-usb.c b/drivers/usb/phy/phy-gpio-vbus-usb.c
index f66120db8a41..8720401ef3ee 100644
--- a/drivers/usb/phy/phy-gpio-vbus-usb.c
+++ b/drivers/usb/phy/phy-gpio-vbus-usb.c
@@ -6,6 +6,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index 00bcc6c6db17..8100d9373052 100644
--- a/drivers/usb/phy/phy-isp1301-omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
@@ -17,6 +17,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/phy/phy-isp1301.c b/drivers/usb/phy/phy-isp1301.c
index f333024660b4..8cc60774b87a 100644
--- a/drivers/usb/phy/phy-isp1301.c
+++ b/drivers/usb/phy/phy-isp1301.c
@@ -8,6 +8,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-keystone.c b/drivers/usb/phy/phy-keystone.c
index 01d4e4cdbc79..606ae0c780db 100644
--- a/drivers/usb/phy/phy-keystone.c
+++ b/drivers/usb/phy/phy-keystone.c
@@ -14,6 +14,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 3d0dd2f97415..38be8fb74355 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -14,6 +14,8 @@ 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c
index fc9ed047d25d..0b219ccb2b0c 100644
--- a/drivers/usb/phy/phy-mv-usb.c
+++ b/drivers/usb/phy/phy-mv-usb.c
@@ -7,6 +7,8 @@ 
  * 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+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-mv-usb.h b/drivers/usb/phy/phy-mv-usb.h
index 551da6eb0ba8..cc99682fb598 100644
--- a/drivers/usb/phy/phy-mv-usb.h
+++ b/drivers/usb/phy/phy-mv-usb.h
@@ -5,6 +5,8 @@ 
  * 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+
  */
 
 #ifndef	__MV_USB_OTG_CONTROLLER__
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 0e2f1a36d315..b72dc6f749ca 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -9,6 +9,8 @@ 
  *
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-omap-otg.c b/drivers/usb/phy/phy-omap-otg.c
index 800d1d90753d..aa11b79ab15f 100644
--- a/drivers/usb/phy/phy-omap-otg.c
+++ b/drivers/usb/phy/phy-omap-otg.c
@@ -15,6 +15,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/io.h>
diff --git a/drivers/usb/phy/phy-qcom-8x16-usb.c b/drivers/usb/phy/phy-qcom-8x16-usb.c
index 679afeaaa9a8..3fdc6544b626 100644
--- a/drivers/usb/phy/phy-qcom-8x16-usb.c
+++ b/drivers/usb/phy/phy-qcom-8x16-usb.c
@@ -9,6 +9,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/clk.h>
diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
index 8babd318c0ed..86b93d708452 100644
--- a/drivers/usb/phy/phy-tahvo.c
+++ b/drivers/usb/phy/phy-tahvo.c
@@ -18,6 +18,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/io.h>
diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index ccc2bf5274b4..32fe2f430613 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -16,6 +16,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/resource.h>
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index b5dc077ed7d3..7e48e9fd5984 100644
--- a/drivers/usb/phy/phy-twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
@@ -18,6 +18,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/phy/phy-ulpi-viewport.c b/drivers/usb/phy/phy-ulpi-viewport.c
index 18bb8264b5a0..09ff211afdcc 100644
--- a/drivers/usb/phy/phy-ulpi-viewport.c
+++ b/drivers/usb/phy/phy-ulpi-viewport.c
@@ -10,6 +10,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/export.h>
diff --git a/drivers/usb/phy/phy-ulpi.c b/drivers/usb/phy/phy-ulpi.c
index f48a7a21e3c2..07b247d15d27 100644
--- a/drivers/usb/phy/phy-ulpi.c
+++ b/drivers/usb/phy/phy-ulpi.c
@@ -21,6 +21,8 @@ 
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c
index 89f4ac4cd93e..7ad49855eae0 100644
--- a/drivers/usb/phy/phy.c
+++ b/drivers/usb/phy/phy.c
@@ -7,6 +7,8 @@ 
  * 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+
  */
 #include <linux/kernel.h>
 #include <linux/export.h>
diff --git a/drivers/usb/renesas_usbhs/Makefile b/drivers/usb/renesas_usbhs/Makefile
index d787d05f6546..3059aedf1f62 100644
--- a/drivers/usb/renesas_usbhs/Makefile
+++ b/drivers/usb/renesas_usbhs/Makefile
@@ -1,6 +1,7 @@ 
 #
 # for Renesas USB
 #
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_USB_RENESAS_USBHS)	+= renesas_usbhs.o
 
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index f0ce304c5aaf..b0f49f8d3753 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #include <linux/err.h>
 #include <linux/gpio.h>
diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index 8c5fc12ad778..03a2e8f993a4 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #ifndef RENESAS_USB_DRIVER_H
 #define RENESAS_USB_DRIVER_H
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 50285b01da92..1e64a2cb4ab4 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/drivers/usb/renesas_usbhs/fifo.h b/drivers/usb/renesas_usbhs/fifo.h
index 8b98507d7abc..12ddb7e64d5a 100644
--- a/drivers/usb/renesas_usbhs/fifo.h
+++ b/drivers/usb/renesas_usbhs/fifo.h
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #ifndef RENESAS_USB_FIFO_H
 #define RENESAS_USB_FIFO_H
diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c
index 28965ef4f824..bef47acdb892 100644
--- a/drivers/usb/renesas_usbhs/mod.c
+++ b/drivers/usb/renesas_usbhs/mod.c
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #include <linux/interrupt.h>
 
diff --git a/drivers/usb/renesas_usbhs/mod.h b/drivers/usb/renesas_usbhs/mod.h
index 1ef5bf604070..03a683a80350 100644
--- a/drivers/usb/renesas_usbhs/mod.h
+++ b/drivers/usb/renesas_usbhs/mod.h
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #ifndef RENESAS_USB_MOD_H
 #define RENESAS_USB_MOD_H
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index c068b673420b..38f37594f906 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/renesas_usbhs/mod_host.c b/drivers/usb/renesas_usbhs/mod_host.c
index e256351cb72d..d86131e253b4 100644
--- a/drivers/usb/renesas_usbhs/mod_host.c
+++ b/drivers/usb/renesas_usbhs/mod_host.c
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #include <linux/io.h>
 #include <linux/list.h>
diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c
index d811f0550c04..b12b6cc9ade2 100644
--- a/drivers/usb/renesas_usbhs/pipe.c
+++ b/drivers/usb/renesas_usbhs/pipe.c
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #include <linux/delay.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/renesas_usbhs/pipe.h b/drivers/usb/renesas_usbhs/pipe.h
index 95185fdb29b1..da13e61f76d8 100644
--- a/drivers/usb/renesas_usbhs/pipe.h
+++ b/drivers/usb/renesas_usbhs/pipe.h
@@ -13,6 +13,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 #ifndef RENESAS_USB_PIPE_H
 #define RENESAS_USB_PIPE_H
diff --git a/drivers/usb/renesas_usbhs/rcar2.c b/drivers/usb/renesas_usbhs/rcar2.c
index 277160bc6f25..626ba1761eed 100644
--- a/drivers/usb/renesas_usbhs/rcar2.c
+++ b/drivers/usb/renesas_usbhs/rcar2.c
@@ -8,6 +8,8 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * SPDX-License-Identifier: GPL-1.0+
  */
 
 #include <linux/gpio.h>
diff --git a/drivers/usb/renesas_usbhs/rcar3.c b/drivers/usb/renesas_usbhs/rcar3.c
index 02b67abfc2a1..5e10bc27c137 100644
--- a/drivers/usb/renesas_usbhs/rcar3.c
+++ b/drivers/usb/renesas_usbhs/rcar3.c
@@ -7,6 +7,8 @@ 
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/delay.h>
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 5a21a82390e1..0a5d6a6f067e 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -1,6 +1,7 @@ 
 #
 # Makefile for the USB serial device drivers.
 #
+# SPDX-License-Identifier: GPL-2.0
 
 # Object file lists.
 
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 569c2200ba42..e81351f5f9dc 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -36,6 +36,8 @@ 
  * and made it all available inside a cd.
  * URL: http://kernel.org/pub/linux/kernel/people/gregkh/ddk/
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <asm/unaligned.h>
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 0adbd38b4eea..328b2b06b119 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -20,6 +20,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 15bc71853db5..c454b1895a84 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -21,6 +21,8 @@ 
  * -- Add true modem control line query capability.  Currently we track the
  *    states reported by the interrupt and the states we request.
  * -- Add support for flush commands
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/belkin_sa.h b/drivers/usb/serial/belkin_sa.h
index c74b58ab56f9..391e4cad67b7 100644
--- a/drivers/usb/serial/belkin_sa.h
+++ b/drivers/usb/serial/belkin_sa.h
@@ -29,6 +29,8 @@ 
  *    I am using to write this driver was acquired by using a modified
  *    UsbSnoop on Windows2000.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __LINUX_USB_SERIAL_BSA_H
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index 8936a83c96cd..dd71de4657ea 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -6,6 +6,8 @@ 
  *	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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 351745aec0e1..62087fa3fee4 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -13,6 +13,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 43a862a90a77..1892dc7fbdf7 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -9,6 +9,8 @@ 
  *
  * Thanks to Randy Dunlap for the original version of this code.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 412f812522ee..8cfe11157385 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -11,6 +11,8 @@ 
  * thanks to Karl Hiramoto karl@hiramoto.org. RTSCTS hardware flow
  * control thanks to Munir Nassar nassarmu@real-time.com
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 47fbd9f0c0c7..77360a1e8485 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -25,6 +25,8 @@ 
  *  supported by a libusb-based userspace device driver.
  *
  *  Homepage: http://www.reiner-sct.de/support/treiber_cyberjack.php#linux
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 90110de715e0..8c25f72101d5 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -16,6 +16,8 @@ 
  *
  * See http://geocities.com/i0xox0i for information on this driver and the
  * earthmate usb device.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* Thanks to Neil Whelchel for writing the first cypress m8 implementation
diff --git a/drivers/usb/serial/cypress_m8.h b/drivers/usb/serial/cypress_m8.h
index 119d2e17077b..e33e8516a136 100644
--- a/drivers/usb/serial/cypress_m8.h
+++ b/drivers/usb/serial/cypress_m8.h
@@ -1,5 +1,6 @@ 
 #ifndef CYPRESS_M8_H
 #define CYPRESS_M8_H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*
  * definitions and function prototypes used for the cypress USB to Serial
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 2ce39af32cfa..280fe1c34fb0 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -13,6 +13,8 @@ 
 *
 *  Peter Berger (pberger@brimson.com)
 *  Al Borchers (borchers@steinerpoint.com)
+ *
+ * SPDX-License-Identifier: GPL-2.0+
 */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 90e603d5f660..fac69b60fa39 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -13,6 +13,8 @@ 
  *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 972f5a5fe577..d22441a2dbba 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -8,6 +8,8 @@ 
  * under the terms of the GNU General Public License version 2 as published by
  * the Free Software Foundation.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c
index 3d616a2a9f96..0872f5f43216 100644
--- a/drivers/usb/serial/f81534.c
+++ b/drivers/usb/serial/f81534.c
@@ -24,6 +24,8 @@ 
  * It can be described by f81534_process_read_urb() and maybe received with
  * 128x1,2,3,4 bytes.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #include <linux/slab.h>
 #include <linux/tty.h>
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 49d1b2d4606d..7affd179fa1d 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -23,6 +23,8 @@ 
  * Change entries from 2004 and earlier can be found in versions of this
  * file in kernel versions prior to the 2.6.24 release.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* Bill Ryder - bryder@sgi.com - wrote the FTDI_SIO implementation */
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index bbcc13df11ac..c712034fa2a1 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -20,6 +20,8 @@ 
  * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the
  * FTDI_SIO implementation.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /* Commands */
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index f9d15bd62785..27d8480b47aa 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -5,6 +5,8 @@ 
  * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais
  * from Rudolf Gugler
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index b2f2e87aed94..bb77c5bce023 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -21,6 +21,8 @@ 
  * 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 USA
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 35cb8c0e584f..bb87a58bdcc3 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -7,6 +7,8 @@ 
  *	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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/io_16654.h b/drivers/usb/serial/io_16654.h
index a53abc9530ff..771fe48f3287 100644
--- a/drivers/usb/serial/io_16654.h
+++ b/drivers/usb/serial/io_16654.h
@@ -8,6 +8,7 @@ 
  *	the Free Software Foundation; either version 2 of the License, or
  *	(at your option) any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ************************************************************************/
 
 #if !defined(_16654_H)
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index bdf8bd814a9a..e30da86f908b 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -27,6 +27,8 @@ 
  * Networks technical support, or Peter Berger <pberger@brimson.com>,
  * or Al Borchers <alborchers@steinerpoint.com>.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/io_edgeport.h b/drivers/usb/serial/io_edgeport.h
index ad9c1d47a619..da27e01b86c7 100644
--- a/drivers/usb/serial/io_edgeport.h
+++ b/drivers/usb/serial/io_edgeport.h
@@ -10,6 +10,7 @@ 
  *	(at your option) any later version.
  *
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ************************************************************************/
 
 #if !defined(_IO_EDGEPORT_H_)
diff --git a/drivers/usb/serial/io_ionsp.h b/drivers/usb/serial/io_ionsp.h
index 5cc591bae54d..e48e479dfea5 100644
--- a/drivers/usb/serial/io_ionsp.h
+++ b/drivers/usb/serial/io_ionsp.h
@@ -12,6 +12,7 @@ 
  *	These definitions are used by both kernel-mode driver and the
  *	peripheral firmware and MUST be kept in sync.
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ************************************************************************/
 
 /************************************************************************
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 6cefb9cb133d..36f90e526f80 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -15,6 +15,8 @@ 
  * For questions or problems with this driver, contact Inside Out
  * Networks technical support, or Peter Berger <pberger@brimson.com>,
  * or Al Borchers <alborchers@steinerpoint.com>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/io_ti.h b/drivers/usb/serial/io_ti.h
index 1bd67b24f916..9d94a049e3b1 100644
--- a/drivers/usb/serial/io_ti.h
+++ b/drivers/usb/serial/io_ti.h
@@ -12,6 +12,7 @@ 
  *	May-29-2002	gkh	Ported to Linux
  *
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ******************************************************************************/
 
 #ifndef _IO_TI_H_
diff --git a/drivers/usb/serial/io_usbvend.h b/drivers/usb/serial/io_usbvend.h
index 6f6a856bc37c..776530262f45 100644
--- a/drivers/usb/serial/io_usbvend.h
+++ b/drivers/usb/serial/io_usbvend.h
@@ -13,6 +13,7 @@ 
  *	the Free Software Foundation; either version 2 of the License, or
  *	(at your option) any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0+
  ************************************************************************/
 
 #if !defined(_USBVEND_H)
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index cde0dcdce9c4..d361a54cb353 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -8,6 +8,8 @@ 
  *	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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 8b1cf18a668b..8ed9b298186d 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -34,6 +34,8 @@ 
  * DCD, DTR, RTS, CTS which are currently faked.
  * It's good enough for PPP at this point. It's based off all kinds of
  * code found in usb/serial and usb/class
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index f9734a96d516..77947832c8a8 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -22,6 +22,8 @@ 
  *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 18fc992a245f..8ccd37dfee9c 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -14,6 +14,8 @@ 
  *
  *  And tested with help of WB Electronics
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/serial/iuu_phoenix.h b/drivers/usb/serial/iuu_phoenix.h
index b82630a3b8fd..ccecbcfeabb2 100644
--- a/drivers/usb/serial/iuu_phoenix.h
+++ b/drivers/usb/serial/iuu_phoenix.h
@@ -13,6 +13,8 @@ 
  *
  *  And tested with help of WB Electronics
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #define   IUU_USB_VENDOR_ID  0x104f
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 5662d324edd2..baffe02dcf68 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -25,6 +25,8 @@ 
 
   Tip 'o the hat to IBM (and previously Linuxcare :) for supporting
   staff in their work on open source projects.
+
+ SPDX-License-Identifier: GPL-2.0+
 */
 
 
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 196908dd25a1..b86e4b460aca 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -12,6 +12,8 @@ 
  *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 595415e59d5d..f5807e4291bc 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -28,6 +28,8 @@ 
  * The code was only tested with a PalmConnect USB adapter; if you
  * are adventurous, try it with any KLSI-based device and let me know how it
  * breaks so that I can fix it!
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /* TODO:
diff --git a/drivers/usb/serial/kl5kusb105.h b/drivers/usb/serial/kl5kusb105.h
index 22a90badc86b..b51b9c1e0c6d 100644
--- a/drivers/usb/serial/kl5kusb105.h
+++ b/drivers/usb/serial/kl5kusb105.h
@@ -1,5 +1,7 @@ 
 /*
  * Definitions for the KLSI KL5KUSB105 serial port adapter
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 /* vendor/product pairs that are known to contain this chipset */
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 3024b9b25360..09f66f677639 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -20,6 +20,8 @@ 
  *
  * Supported readers: USB TWIN, KAAN Standard Plus and SecOVID Reader Plus
  * (Adapter K), B1 Professional and KAAN Professional (Adapter B)
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 
diff --git a/drivers/usb/serial/kobil_sct.h b/drivers/usb/serial/kobil_sct.h
index be207f7156fe..f402af2cb281 100644
--- a/drivers/usb/serial/kobil_sct.h
+++ b/drivers/usb/serial/kobil_sct.h
@@ -23,7 +23,11 @@ 
 #define SUSBCR_SSL_SETDTR			0x0004
 #define SUSBCR_SSL_CLRDTR			0x0010
 
-/* Kill the pending/current writes to the comm port. */
+/*
+ * Kill the pending/current writes to the comm port.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ */
 #define SUSBCR_SSL_PURGE_TXABORT		0x0100
 /* Kill the pending/current reads to the comm port. */
 #define SUSBCR_SSL_PURGE_RXABORT		0x0200
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 70f346f1aa86..02ad6b28cffc 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -19,6 +19,8 @@ 
  *   DTR/RTS signal handling may be incomplete or incorrect. I have mainly
  *   implemented what I have seen with SniffUSB or found in belkin_sa.c.
  *   For further TODOs check also belkin_sa.c.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/mct_u232.h b/drivers/usb/serial/mct_u232.h
index d325bb8cb583..96f90d9c4a5d 100644
--- a/drivers/usb/serial/mct_u232.h
+++ b/drivers/usb/serial/mct_u232.h
@@ -17,6 +17,8 @@ 
  * All of the information about the device was acquired by using SniffUSB
  * on Windows98. The technical details of the reverse engineering are
  * summarized at the end of this file.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __LINUX_USB_SERIAL_MCT_U232_H
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index cc84da8dbb84..983ca9cb3943 100644
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -4,6 +4,8 @@ 
 
   Copyright:	2007 Metrologic Instruments. All rights reserved.
   Copyright:	2011 Azimut Ltd. <http://azimutrzn.ru/>
+
+ SPDX-License-Identifier: GPL-2.0
 */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index a453965f9e9a..db40b2d4fc4b 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -19,6 +19,8 @@ 
  * Originally based on drivers/usb/serial/io_edgeport.c which is:
  *	Copyright (C) 2000 Inside Out Networks, All rights reserved.
  *	Copyright (C) 2001-2002 Greg Kroah-Hartman <greg@kroah.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index e8669aae14b3..66e35054d7c9 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -20,6 +20,8 @@ 
  *      Copyright (C) 2000 Inside Out Networks, All rights reserved.
  *      Copyright (C) 2001-2002 Greg Kroah-Hartman <greg@kroah.com>
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/mxuport.c b/drivers/usb/serial/mxuport.c
index 3aef091fe88b..27c965b6f27a 100644
--- a/drivers/usb/serial/mxuport.c
+++ b/drivers/usb/serial/mxuport.c
@@ -14,6 +14,8 @@ 
  *	 4 ports : UPort 1410, UPort 1450, UPort 1450I
  *	 8 ports : UPort 1610-8, UPort 1650-8
  *	16 ports : UPort 1610-16, UPort 1650-16
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c
index 2a97cdc078d5..9688a3d27f0e 100644
--- a/drivers/usb/serial/navman.c
+++ b/drivers/usb/serial/navman.c
@@ -10,6 +10,8 @@ 
  * TODO:
  *	Add termios method that uses copy_hw but also kills all echo
  *	flags as the navman is rx only so cannot echo.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/gfp.h>
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index efcd7feed6f4..150da351b2d4 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -11,6 +11,8 @@ 
  * driver
  *
  * Please report both successes and troubles to the author at omninet@kroah.com
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 58657d64678b..47b6036eefa8 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -9,6 +9,8 @@ 
  *	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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index ba672cf4e888..1f95b108935d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -26,6 +26,8 @@ 
   Some of the "one port" devices actually exhibit multiple USB instances
   on the USB bus. This is not a bug, these ports are used for different
   device features.
+
+ SPDX-License-Identifier: GPL-2.0
 */
 
 #define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>"
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index b11eead469ee..4b7dfbb07b4e 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -35,6 +35,8 @@ 
  *  - implement more ioctls
  *  - test/implement flow control
  *  - allow setting custom baud rates
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/oti6858.h b/drivers/usb/serial/oti6858.h
index 704ac3a532b3..f1cd0a097460 100644
--- a/drivers/usb/serial/oti6858.h
+++ b/drivers/usb/serial/oti6858.h
@@ -5,6 +5,8 @@ 
  * 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+
  */
 #ifndef __LINUX_USB_SERIAL_OTI6858_H
 #define __LINUX_USB_SERIAL_OTI6858_H
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index a585b477415d..51793e39f00e 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -12,6 +12,8 @@ 
  *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 3b5a15d1dc0d..131aa78492ac 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -6,6 +6,8 @@ 
  *	the Free Software Foundation; either version 2 of the License, or
  *	(at your option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #define BENQ_VENDOR_ID			0x04a5
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c
index 6e9f8af96959..5f3be1946c9e 100644
--- a/drivers/usb/serial/qcaux.c
+++ b/drivers/usb/serial/qcaux.c
@@ -13,6 +13,8 @@ 
  * cannot be used simultaneously for status or signal strength.  Instead, the
  * ports here can be queried for that information using the Qualcomm DM
  * protocol.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index eb9928963a53..9a34705ca3b2 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -9,6 +9,8 @@ 
  *	modify it under the terms of the GNU General Public License version
  *	2 as published by the Free Software Foundation.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/tty.h>
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 60e17d1444c3..80eaadd9af93 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -11,6 +11,8 @@ 
  *  These devices all have only 1 bulk in and 1 bulk out that is shared
  *  for all serial ports.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <asm/unaligned.h>
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 27d7a7016298..49d8c5cde17e 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -12,6 +12,8 @@ 
  *
  * By:
  *      Stuart Lynne <sl@lineo.com>, Tom Rushworth <tbr@lineo.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 4c4ac4705ac0..eb7c9f0a9523 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -15,6 +15,8 @@ 
 
   Portions based on the option driver by Matthias Urlichs <smurf@smurf.noris.de>
   Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org>
+
+ SPDX-License-Identifier: GPL-2.0
 */
 /* Uncomment to log function calls */
 /* #define DEBUG */
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 5167b6564c8b..20a658a921af 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -13,6 +13,8 @@ 
  *	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+
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index 5aa7bbbeba3d..8319d83ded17 100644
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -3,6 +3,8 @@ 
  *
  * based on ftdi_sio.c and the original serqt_usb.c from Quatech
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/errno.h>
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 0d1727232d0c..2f028c4ec807 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -8,6 +8,8 @@ 
  *	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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 8fc3854e5e69..fccc5536fca0 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -15,6 +15,8 @@ 
  * For questions or problems with this driver, contact Texas Instruments
  * technical support, or Al Borchers <alborchers@steinerpoint.com>, or
  * Peter Berger <pberger@brimson.com>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/upd78f0730.c b/drivers/usb/serial/upd78f0730.c
index 6819a3486e5d..7e5125ab48d9 100644
--- a/drivers/usb/serial/upd78f0730.c
+++ b/drivers/usb/serial/upd78f0730.c
@@ -19,6 +19,8 @@ 
  * - flow control: none
  * - baud rates: 0, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 153600
  * - signals: DTR, RTS and BREAK
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c
index e98b6e57b703..39bdc17e6649 100644
--- a/drivers/usb/serial/usb-serial-simple.c
+++ b/drivers/usb/serial/usb-serial-simple.c
@@ -12,6 +12,8 @@ 
  *	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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index bb34f9f7eaf4..cf24a4937874 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -15,6 +15,8 @@ 
  *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h
index 44b25c08c68a..432b25d21ec2 100644
--- a/drivers/usb/serial/usb-wwan.h
+++ b/drivers/usb/serial/usb-wwan.h
@@ -1,5 +1,7 @@ 
 /*
  * Definitions for USB serial mobile broadband cards
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __LINUX_USB_USB_WWAN
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
index 12f4c5a91e62..2a6d28fefb33 100644
--- a/drivers/usb/serial/usb_debug.c
+++ b/drivers/usb/serial/usb_debug.c
@@ -6,6 +6,8 @@ 
  *	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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/gfp.h>
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 59bfcb3da116..09804a188a59 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -17,6 +17,8 @@ 
   with GSM modems. Issues:
   - data loss -- one single Receive URB is not nearly enough
   - controlling the baud rate doesn't make sense
+
+ SPDX-License-Identifier: GPL-2.0
 */
 
 #define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>"
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 9f3317a940ef..5c03d3d3c83c 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -12,6 +12,8 @@ 
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h
index 4c456dd69ce5..88d375c4bf58 100644
--- a/drivers/usb/serial/visor.h
+++ b/drivers/usb/serial/visor.h
@@ -12,6 +12,8 @@ 
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __LINUX_USB_SERIAL_VISOR_H
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 55cebc1e6fec..3d8698b30ab5 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -14,6 +14,8 @@ 
  *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/whiteheat.h b/drivers/usb/serial/whiteheat.h
index 38065df4d2d8..3f67112f9ed7 100644
--- a/drivers/usb/serial/whiteheat.h
+++ b/drivers/usb/serial/whiteheat.h
@@ -15,6 +15,8 @@ 
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __LINUX_USB_SERIAL_WHITEHEAT_H
diff --git a/drivers/usb/serial/wishbone-serial.c b/drivers/usb/serial/wishbone-serial.c
index 4fed4a0bd702..ebb3da5cc8e5 100644
--- a/drivers/usb/serial/wishbone-serial.c
+++ b/drivers/usb/serial/wishbone-serial.c
@@ -8,6 +8,8 @@ 
  * 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+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
index 3837d5113bb2..d71ec3c952d5 100644
--- a/drivers/usb/serial/xsens_mt.c
+++ b/drivers/usb/serial/xsens_mt.c
@@ -6,6 +6,8 @@ 
  *  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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
index 4cd55481b309..3627a1abcd46 100644
--- a/drivers/usb/storage/Makefile
+++ b/drivers/usb/storage/Makefile
@@ -4,6 +4,7 @@ 
 # 15 Aug 2000, Christoph Hellwig <hch@infradead.org>
 # Rewritten to use lists instead of if-statements.
 #
+# SPDX-License-Identifier: GPL-2.0
 
 ccflags-y := -Idrivers/scsi
 
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c
index 878b4b8761f5..906c10520c4d 100644
--- a/drivers/usb/storage/alauda.c
+++ b/drivers/usb/storage/alauda.c
@@ -29,6 +29,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/cypress_atacb.c b/drivers/usb/storage/cypress_atacb.c
index 5e4af44d7d9f..12a5a144e6fa 100644
--- a/drivers/usb/storage/cypress_atacb.c
+++ b/drivers/usb/storage/cypress_atacb.c
@@ -17,6 +17,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c
index 723197af6ec5..738e9ab28bd0 100644
--- a/drivers/usb/storage/datafab.c
+++ b/drivers/usb/storage/datafab.c
@@ -32,6 +32,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c
index 8d20804a59e6..ea2e82f9a23c 100644
--- a/drivers/usb/storage/debug.c
+++ b/drivers/usb/storage/debug.c
@@ -41,6 +41,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h
index 8ab73299b650..25fe1e9b1bf9 100644
--- a/drivers/usb/storage/debug.h
+++ b/drivers/usb/storage/debug.h
@@ -38,6 +38,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef _DEBUG_H_
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index 28100374f7bd..34eff821afc9 100644
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -13,6 +13,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 #include <linux/jiffies.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index c0a5d954414b..0dcbd1bc0401 100644
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -25,6 +25,8 @@ 
  * This driver was developed with information provided in FREECOM's USB
  * Programmers Reference Guide.  For further information contact Freecom
  * (http://www.freecom.de/)
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/initializers.c b/drivers/usb/storage/initializers.c
index d9d8c17e05d1..ae16708b33bf 100644
--- a/drivers/usb/storage/initializers.c
+++ b/drivers/usb/storage/initializers.c
@@ -34,6 +34,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/errno.h>
diff --git a/drivers/usb/storage/initializers.h b/drivers/usb/storage/initializers.h
index 039abf4d1cb7..87ebbd5d7fcb 100644
--- a/drivers/usb/storage/initializers.h
+++ b/drivers/usb/storage/initializers.h
@@ -34,6 +34,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include "usb.h"
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 6a7720e66595..8d4f1630ac50 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -38,6 +38,8 @@ 
  *	      (Luc Saillard <luc@saillard.org>)
  *  2002-01-17: All bitfields removed.
  *	      (bjorn@haxx.se)
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 
diff --git a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
index 011e5270690a..1747fefcb469 100644
--- a/drivers/usb/storage/jumpshot.c
+++ b/drivers/usb/storage/jumpshot.c
@@ -33,6 +33,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
  
  /*
diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c
index b05ba4929f00..0fc66d53b80b 100644
--- a/drivers/usb/storage/karma.c
+++ b/drivers/usb/storage/karma.c
@@ -17,6 +17,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index acc3d03d8c1e..3e0321712385 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -9,6 +9,8 @@ 
  *
  * Based on usbmouse.c (Vojtech Pavlik) and xpad.c (Marko Friedemann)
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/storage/option_ms.c b/drivers/usb/storage/option_ms.c
index 4a73cd4783ae..fc51d9c8c696 100644
--- a/drivers/usb/storage/option_ms.c
+++ b/drivers/usb/storage/option_ms.c
@@ -18,6 +18,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/usb.h>
diff --git a/drivers/usb/storage/option_ms.h b/drivers/usb/storage/option_ms.h
index b6e448cab039..3e6abb16deb8 100644
--- a/drivers/usb/storage/option_ms.h
+++ b/drivers/usb/storage/option_ms.h
@@ -1,4 +1,5 @@ 
 #ifndef _OPTION_MS_H_
 #define _OPTION_MS_H_
+/* SPDX-License-Identifier: GPL-2.0 */
 extern int option_ms_init(struct us_data *us);
 #endif
diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
index 74c38870a17e..90a12424d935 100644
--- a/drivers/usb/storage/protocol.c
+++ b/drivers/usb/storage/protocol.c
@@ -41,6 +41,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/highmem.h>
diff --git a/drivers/usb/storage/protocol.h b/drivers/usb/storage/protocol.h
index a55666880b7b..3a1dfd305b4e 100644
--- a/drivers/usb/storage/protocol.h
+++ b/drivers/usb/storage/protocol.h
@@ -35,6 +35,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef _PROTOCOL_H_
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index ec83b3b5efa9..7c3a5995f2a8 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -19,6 +19,8 @@ 
  * Author:
  *   wwang (wei_wang@realsil.com.cn)
  *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 8cd2926fb1fe..682656f770eb 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -42,6 +42,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/module.h>
diff --git a/drivers/usb/storage/scsiglue.h b/drivers/usb/storage/scsiglue.h
index d0a331dd9bc5..1a4092b9934d 100644
--- a/drivers/usb/storage/scsiglue.h
+++ b/drivers/usb/storage/scsiglue.h
@@ -35,6 +35,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef _SCSIGLUE_H_
diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index 44f8ffccd031..2272d7096985 100644
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -25,6 +25,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index 147c50b3e00f..4ed9574c6688 100644
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -21,6 +21,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/jiffies.h>
diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index 3b0294e4df93..df28078e2f0d 100644
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -40,6 +40,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/errno.h>
diff --git a/drivers/usb/storage/sierra_ms.c b/drivers/usb/storage/sierra_ms.c
index 9a51019ac7b2..b10b779126fc 100644
--- a/drivers/usb/storage/sierra_ms.c
+++ b/drivers/usb/storage/sierra_ms.c
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/drivers/usb/storage/sierra_ms.h b/drivers/usb/storage/sierra_ms.h
index bb48634ac1fc..1db7d6b269ae 100644
--- a/drivers/usb/storage/sierra_ms.h
+++ b/drivers/usb/storage/sierra_ms.h
@@ -1,4 +1,5 @@ 
 #ifndef _SIERRA_MS_H_
 #define _SIERRA_MS_H_
+/* SPDX-License-Identifier: GPL-2.0 */
 extern int sierra_ms_init(struct us_data *us);
 #endif
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index a3ccb899df60..fad0000570f6 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -42,6 +42,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/sched.h>
diff --git a/drivers/usb/storage/transport.h b/drivers/usb/storage/transport.h
index dae3ecd2e6cf..aded32cc921f 100644
--- a/drivers/usb/storage/transport.h
+++ b/drivers/usb/storage/transport.h
@@ -35,6 +35,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef _TRANSPORT_H_
diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h
index a155cd02bce2..1fcd758a961f 100644
--- a/drivers/usb/storage/uas-detect.h
+++ b/drivers/usb/storage/uas-detect.h
@@ -1,3 +1,4 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
 #include "usb.h"
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 63cf981ed81c..070fce75d672 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -7,6 +7,8 @@ 
  * Copyright Sarah Sharp for Intel Corp, 2010
  *
  * Distributed under the terms of the GNU GPL, version two.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/blkdev.h>
diff --git a/drivers/usb/storage/unusual_alauda.h b/drivers/usb/storage/unusual_alauda.h
index 763bc03032a1..5ebbea19bb12 100644
--- a/drivers/usb/storage/unusual_alauda.h
+++ b/drivers/usb/storage/unusual_alauda.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_ALAUDA) || \
diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h
index e9a2eb88869a..94315063c1ca 100644
--- a/drivers/usb/storage/unusual_cypress.h
+++ b/drivers/usb/storage/unusual_cypress.h
@@ -15,6 +15,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_CYPRESS_ATACB) || \
diff --git a/drivers/usb/storage/unusual_datafab.h b/drivers/usb/storage/unusual_datafab.h
index 5049b6bbe5d5..9b419c27f134 100644
--- a/drivers/usb/storage/unusual_datafab.h
+++ b/drivers/usb/storage/unusual_datafab.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_DATAFAB) || \
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index eb06d88b41d6..020a3709ef32 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -24,6 +24,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/storage/unusual_ene_ub6250.h b/drivers/usb/storage/unusual_ene_ub6250.h
index 5667f5d365c6..ceaebcc89c14 100644
--- a/drivers/usb/storage/unusual_ene_ub6250.h
+++ b/drivers/usb/storage/unusual_ene_ub6250.h
@@ -13,6 +13,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_ENE_UB6250) || \
diff --git a/drivers/usb/storage/unusual_freecom.h b/drivers/usb/storage/unusual_freecom.h
index 1f5aab42ece2..e37c1cb48eea 100644
--- a/drivers/usb/storage/unusual_freecom.h
+++ b/drivers/usb/storage/unusual_freecom.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_FREECOM) || \
diff --git a/drivers/usb/storage/unusual_isd200.h b/drivers/usb/storage/unusual_isd200.h
index 9b6862ec3d4f..5684ea5cd1be 100644
--- a/drivers/usb/storage/unusual_isd200.h
+++ b/drivers/usb/storage/unusual_isd200.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_ISD200) || \
diff --git a/drivers/usb/storage/unusual_jumpshot.h b/drivers/usb/storage/unusual_jumpshot.h
index 413e64fa6b95..a3fe2c67c1fe 100644
--- a/drivers/usb/storage/unusual_jumpshot.h
+++ b/drivers/usb/storage/unusual_jumpshot.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_JUMPSHOT) || \
diff --git a/drivers/usb/storage/unusual_karma.h b/drivers/usb/storage/unusual_karma.h
index e6fad3aeae20..a25939418160 100644
--- a/drivers/usb/storage/unusual_karma.h
+++ b/drivers/usb/storage/unusual_karma.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_KARMA) || \
diff --git a/drivers/usb/storage/unusual_onetouch.h b/drivers/usb/storage/unusual_onetouch.h
index 425dc22f345a..cc1ccb4fab8a 100644
--- a/drivers/usb/storage/unusual_onetouch.h
+++ b/drivers/usb/storage/unusual_onetouch.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_ONETOUCH) || \
diff --git a/drivers/usb/storage/unusual_realtek.h b/drivers/usb/storage/unusual_realtek.h
index 8fe624ad302a..bebf4ba9b3ef 100644
--- a/drivers/usb/storage/unusual_realtek.h
+++ b/drivers/usb/storage/unusual_realtek.h
@@ -19,6 +19,8 @@ 
  * Author:
  *   wwang (wei_wang@realsil.com.cn)
  *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_REALTEK) || \
diff --git a/drivers/usb/storage/unusual_sddr09.h b/drivers/usb/storage/unusual_sddr09.h
index d9d38ac4abf9..0d412e92997f 100644
--- a/drivers/usb/storage/unusual_sddr09.h
+++ b/drivers/usb/storage/unusual_sddr09.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_SDDR09) || \
diff --git a/drivers/usb/storage/unusual_sddr55.h b/drivers/usb/storage/unusual_sddr55.h
index ebb1d1c6c467..3b914626f15a 100644
--- a/drivers/usb/storage/unusual_sddr55.h
+++ b/drivers/usb/storage/unusual_sddr55.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_SDDR55) || \
diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
index cde115359793..95bb5b5723ae 100644
--- a/drivers/usb/storage/unusual_uas.h
+++ b/drivers/usb/storage/unusual_uas.h
@@ -20,6 +20,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 /*
diff --git a/drivers/usb/storage/unusual_usbat.h b/drivers/usb/storage/unusual_usbat.h
index 2044ad5ef5e4..eb4d1c31e782 100644
--- a/drivers/usb/storage/unusual_usbat.h
+++ b/drivers/usb/storage/unusual_usbat.h
@@ -14,6 +14,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #if defined(CONFIG_USB_STORAGE_USBAT) || \
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 0dceb9fa3a06..bd7d7c022100 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -44,6 +44,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifdef CONFIG_USB_STORAGE_DEBUG
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 8fae28b40bb4..f8aaaccfcd33 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -38,6 +38,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef _USB_H_
diff --git a/drivers/usb/storage/usual-tables.c b/drivers/usb/storage/usual-tables.c
index 499669bcf700..d962cc3a286f 100644
--- a/drivers/usb/storage/usual-tables.c
+++ b/drivers/usb/storage/usual-tables.c
@@ -20,6 +20,8 @@ 
  * 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.,
  * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/typec/typec.c b/drivers/usb/typec/typec.c
index 24e355ba109d..4c462822c4a6 100644
--- a/drivers/usb/typec/typec.c
+++ b/drivers/usb/typec/typec.c
@@ -7,6 +7,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/typec/typec_wcove.c b/drivers/usb/typec/typec_wcove.c
index 4ce30a967962..33da23a105dd 100644
--- a/drivers/usb/typec/typec_wcove.c
+++ b/drivers/usb/typec/typec_wcove.c
@@ -7,6 +7,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/acpi.h>
diff --git a/drivers/usb/typec/ucsi/Makefile b/drivers/usb/typec/ucsi/Makefile
index 8372fc22f9b3..b57891c1fd31 100644
--- a/drivers/usb/typec/ucsi/Makefile
+++ b/drivers/usb/typec/ucsi/Makefile
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS_trace.o			:= -I$(src)
 
 obj-$(CONFIG_TYPEC_UCSI)	+= typec_ucsi.o
diff --git a/drivers/usb/typec/ucsi/debug.h b/drivers/usb/typec/ucsi/debug.h
index e4d8fc763e6c..cf6823b50a14 100644
--- a/drivers/usb/typec/ucsi/debug.h
+++ b/drivers/usb/typec/ucsi/debug.h
@@ -1,5 +1,6 @@ 
 #ifndef __UCSI_DEBUG_H
 #define __UCSI_DEBUG_H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include "ucsi.h"
 
diff --git a/drivers/usb/typec/ucsi/trace.h b/drivers/usb/typec/ucsi/trace.h
index 98b404404834..dc48d8b27c18 100644
--- a/drivers/usb/typec/ucsi/trace.h
+++ b/drivers/usb/typec/ucsi/trace.h
@@ -5,6 +5,7 @@ 
 #if !defined(__UCSI_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define __UCSI_TRACE_H
 
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/tracepoint.h>
 #include "ucsi.h"
 #include "debug.h"
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 714c5bcedf2b..897561687ba9 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -7,6 +7,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/completion.h>
diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
index 8a88f45822e3..3843fd35bdc5 100644
--- a/drivers/usb/typec/ucsi/ucsi.h
+++ b/drivers/usb/typec/ucsi/ucsi.h
@@ -1,6 +1,7 @@ 
 
 #ifndef __DRIVER_USB_TYPEC_UCSI_H
 #define __DRIVER_USB_TYPEC_UCSI_H
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/bitops.h>
 #include <linux/device.h>
diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c
index cabd47612b0a..437bcee5b0a2 100644
--- a/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@ -7,6 +7,8 @@ 
  * 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/platform_device.h>
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index bb0bd732e29a..dba747ff4d11 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -10,6 +10,8 @@ 
  * This driver is based on the 2.6.3 version of drivers/usb/usb-skeleton.c
  * but has been rewritten to be easier to read and use.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/usbip/Makefile b/drivers/usb/usbip/Makefile
index d843a9e68852..f4c8f3840262 100644
--- a/drivers/usb/usbip/Makefile
+++ b/drivers/usb/usbip/Makefile
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_USBIP_DEBUG) := -DDEBUG
 
 obj-$(CONFIG_USBIP_CORE) += usbip-core.o
diff --git a/drivers/usb/usbip/stub.h b/drivers/usb/usbip/stub.h
index 910f027773aa..085d9deb7dc3 100644
--- a/drivers/usb/usbip/stub.h
+++ b/drivers/usb/usbip/stub.h
@@ -15,6 +15,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __USBIP_STUB_H
diff --git a/drivers/usb/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
index c653ce533430..38bb826cc513 100644
--- a/drivers/usb/usbip/stub_dev.c
+++ b/drivers/usb/usbip/stub_dev.c
@@ -15,6 +15,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/usbip/stub_main.c b/drivers/usb/usbip/stub_main.c
index 7170404e8979..24debe3ed6ed 100644
--- a/drivers/usb/usbip/stub_main.c
+++ b/drivers/usb/usbip/stub_main.c
@@ -15,6 +15,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/string.h>
diff --git a/drivers/usb/usbip/stub_rx.c b/drivers/usb/usbip/stub_rx.c
index 191b176ffedf..1904567546c9 100644
--- a/drivers/usb/usbip/stub_rx.c
+++ b/drivers/usb/usbip/stub_rx.c
@@ -15,6 +15,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <asm/byteorder.h>
diff --git a/drivers/usb/usbip/stub_tx.c b/drivers/usb/usbip/stub_tx.c
index be50cef645d8..9f1d094f973d 100644
--- a/drivers/usb/usbip/stub_tx.c
+++ b/drivers/usb/usbip/stub_tx.c
@@ -15,6 +15,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c
index 2281f3562870..b6d5af58b683 100644
--- a/drivers/usb/usbip/usbip_common.c
+++ b/drivers/usb/usbip/usbip_common.c
@@ -17,6 +17,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <asm/byteorder.h>
diff --git a/drivers/usb/usbip/usbip_common.h b/drivers/usb/usbip/usbip_common.h
index 3050fc99a417..40be105ea15c 100644
--- a/drivers/usb/usbip/usbip_common.h
+++ b/drivers/usb/usbip/usbip_common.h
@@ -17,6 +17,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __USBIP_COMMON_H
diff --git a/drivers/usb/usbip/usbip_event.c b/drivers/usb/usbip/usbip_event.c
index f1635662c299..d3ce7d3ea5f6 100644
--- a/drivers/usb/usbip/usbip_event.c
+++ b/drivers/usb/usbip/usbip_event.c
@@ -16,6 +16,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
index 5cfb59e98e44..5d52ba7e69ea 100644
--- a/drivers/usb/usbip/vhci.h
+++ b/drivers/usb/usbip/vhci.h
@@ -7,6 +7,8 @@ 
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __USBIP_VHCI_H
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index 11b9a22799cc..ccfe32a4d5d4 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -16,6 +16,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/init.h>
diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
index ef2f2d5ca6b2..3770af4c7703 100644
--- a/drivers/usb/usbip/vhci_rx.c
+++ b/drivers/usb/usbip/vhci_rx.c
@@ -15,6 +15,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c
index 1b9f60a22e0b..9ae2ec33ba59 100644
--- a/drivers/usb/usbip/vhci_sysfs.c
+++ b/drivers/usb/usbip/vhci_sysfs.c
@@ -16,6 +16,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
index 3e7878fe2fd4..d9ff78200c67 100644
--- a/drivers/usb/usbip/vhci_tx.c
+++ b/drivers/usb/usbip/vhci_tx.c
@@ -15,6 +15,8 @@ 
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/kthread.h>
diff --git a/drivers/usb/usbip/vudc.h b/drivers/usb/usbip/vudc.h
index 25e01b09c4c3..ee7719135911 100644
--- a/drivers/usb/usbip/vudc.h
+++ b/drivers/usb/usbip/vudc.h
@@ -16,6 +16,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #ifndef __USBIP_VUDC_H
diff --git a/drivers/usb/usbip/vudc_dev.c b/drivers/usb/usbip/vudc_dev.c
index 968471b62cbc..7704d2fdc905 100644
--- a/drivers/usb/usbip/vudc_dev.c
+++ b/drivers/usb/usbip/vudc_dev.c
@@ -16,6 +16,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c
index 9e655714e389..f5253aa11702 100644
--- a/drivers/usb/usbip/vudc_main.c
+++ b/drivers/usb/usbip/vudc_main.c
@@ -16,6 +16,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/usbip/vudc_rx.c b/drivers/usb/usbip/vudc_rx.c
index e429b59f6f8a..382789664d65 100644
--- a/drivers/usb/usbip/vudc_rx.c
+++ b/drivers/usb/usbip/vudc_rx.c
@@ -15,6 +15,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <net/sock.h>
diff --git a/drivers/usb/usbip/vudc_sysfs.c b/drivers/usb/usbip/vudc_sysfs.c
index 0f98f2c7475f..fe5eba8e140c 100644
--- a/drivers/usb/usbip/vudc_sysfs.c
+++ b/drivers/usb/usbip/vudc_sysfs.c
@@ -16,6 +16,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/device.h>
diff --git a/drivers/usb/usbip/vudc_transfer.c b/drivers/usb/usbip/vudc_transfer.c
index 4cfd475ee865..c70ec77f2273 100644
--- a/drivers/usb/usbip/vudc_transfer.c
+++ b/drivers/usb/usbip/vudc_transfer.c
@@ -19,6 +19,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/usb.h>
diff --git a/drivers/usb/usbip/vudc_tx.c b/drivers/usb/usbip/vudc_tx.c
index 234661782fa0..3fbf0d3c17c1 100644
--- a/drivers/usb/usbip/vudc_tx.c
+++ b/drivers/usb/usbip/vudc_tx.c
@@ -15,6 +15,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <net/sock.h>
diff --git a/drivers/usb/wusbcore/Makefile b/drivers/usb/wusbcore/Makefile
index b3bd313032b1..d604ccdd916f 100644
--- a/drivers/usb/wusbcore/Makefile
+++ b/drivers/usb/wusbcore/Makefile
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_USB_WUSB_CBAF_DEBUG) := -DDEBUG
 
 obj-$(CONFIG_USB_WUSB)		+= wusbcore.o
diff --git a/drivers/usb/wusbcore/cbaf.c b/drivers/usb/wusbcore/cbaf.c
index aa4e440e9975..b5ff9309693c 100644
--- a/drivers/usb/wusbcore/cbaf.c
+++ b/drivers/usb/wusbcore/cbaf.c
@@ -85,6 +85,8 @@ 
  * References:
  *   [WUSB-AM] Association Models Supplement to the Certified Wireless
  *             Universal Serial Bus Specification, version 1.0.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/module.h>
 #include <linux/ctype.h>
diff --git a/drivers/usb/wusbcore/crypto.c b/drivers/usb/wusbcore/crypto.c
index 062c205f0046..1c4df4a49676 100644
--- a/drivers/usb/wusbcore/crypto.c
+++ b/drivers/usb/wusbcore/crypto.c
@@ -43,6 +43,8 @@ 
  *
  *             Conveniently, some data structures that need to be
  *             funneled through AES are...16 bytes in size!
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <crypto/skcipher.h>
diff --git a/drivers/usb/wusbcore/dev-sysfs.c b/drivers/usb/wusbcore/dev-sysfs.c
index 78212f8180ce..f7c555f70a38 100644
--- a/drivers/usb/wusbcore/dev-sysfs.c
+++ b/drivers/usb/wusbcore/dev-sysfs.c
@@ -21,6 +21,8 @@ 
  *
  *
  * Get them out of the way...
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/jiffies.h>
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index bf9551735938..a2fd05308224 100644
--- a/drivers/usb/wusbcore/devconnect.c
+++ b/drivers/usb/wusbcore/devconnect.c
@@ -84,6 +84,8 @@ 
  *   Before the @wusbhc structure put()s the reference it owns for
  *   port->wusb_dev [and clean the wusb_dev pointer], it needs to
  *   lock @wusbhc->mutex.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/jiffies.h>
diff --git a/drivers/usb/wusbcore/mmc.c b/drivers/usb/wusbcore/mmc.c
index 3f485df96226..6ba80e80947a 100644
--- a/drivers/usb/wusbcore/mmc.c
+++ b/drivers/usb/wusbcore/mmc.c
@@ -35,6 +35,8 @@ 
  *
  * FIXME:
  *  - add timers that autoremove intervalled IEs?
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/usb/wusb.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/wusbcore/pal.c b/drivers/usb/wusbcore/pal.c
index 090f27371a8f..f63795f829c7 100644
--- a/drivers/usb/wusbcore/pal.c
+++ b/drivers/usb/wusbcore/pal.c
@@ -15,6 +15,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include "wusbhc.h"
 
diff --git a/drivers/usb/wusbcore/reservation.c b/drivers/usb/wusbcore/reservation.c
index 7b1b2e2fb673..df9795b09a06 100644
--- a/drivers/usb/wusbcore/reservation.c
+++ b/drivers/usb/wusbcore/reservation.c
@@ -14,6 +14,8 @@ 
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/kernel.h>
 #include <linux/uwb.h>
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c
index a082fe62b1f0..6e2ffb85c547 100644
--- a/drivers/usb/wusbcore/rh.c
+++ b/drivers/usb/wusbcore/rh.c
@@ -68,6 +68,8 @@ 
  * wusbhc_rh_[suspend|resume]() That
  *
  * wusbhc_rh_start_port_reset() ??? unimplemented
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/slab.h>
 #include <linux/export.h>
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 170f2c38de9b..03172d4bdc7e 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -21,6 +21,8 @@ 
  *
  *
  * FIXME: docs
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/types.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/wusbcore/wa-hc.c b/drivers/usb/wusbcore/wa-hc.c
index d01496fd27fe..09bfdc8a5d8b 100644
--- a/drivers/usb/wusbcore/wa-hc.c
+++ b/drivers/usb/wusbcore/wa-hc.c
@@ -21,6 +21,8 @@ 
  *
  *
  * FIXME: docs
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/slab.h>
 #include <linux/module.h>
diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
index edc7267157f3..c836f1b53dca 100644
--- a/drivers/usb/wusbcore/wa-hc.h
+++ b/drivers/usb/wusbcore/wa-hc.h
@@ -75,6 +75,8 @@ 
  * The rest of the traffic is in the usual entry points of a USB HCD,
  * which are hooked up in driver.c:hwahc_rc_driver, and defined in
  * hcd.c.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __HWAHC_INTERNAL_H__
diff --git a/drivers/usb/wusbcore/wa-nep.c b/drivers/usb/wusbcore/wa-nep.c
index e3819fc182b0..d9bb6732e483 100644
--- a/drivers/usb/wusbcore/wa-nep.c
+++ b/drivers/usb/wusbcore/wa-nep.c
@@ -48,6 +48,8 @@ 
  * wa_nep_cb()                 Callback for the notification
  *                                endpoint; when data is ready, this
  *                                does the dispatching.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/workqueue.h>
 #include <linux/ctype.h>
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c
index c7ecdbe19a32..c69fa9859aa6 100644
--- a/drivers/usb/wusbcore/wa-rpipe.c
+++ b/drivers/usb/wusbcore/wa-rpipe.c
@@ -56,6 +56,8 @@ 
  *  never take addresses from the urb->pipe, but from the
  *  urb->dev->devnum, to make sure that we always have the right
  *  destination address.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/atomic.h>
 #include <linux/bitmap.h>
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index e70322b1dd02..eef61421b368 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -78,6 +78,8 @@ 
  *     to where we have a list of transactions to do and based on the
  *     availability of the different required components (blocks,
  *     rpipes, segment slots, etc), we go scheduling them. Painful.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/spinlock.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/wusbcore/wusbhc.c b/drivers/usb/wusbcore/wusbhc.c
index 5338e42533c8..456436706ba5 100644
--- a/drivers/usb/wusbcore/wusbhc.c
+++ b/drivers/usb/wusbcore/wusbhc.c
@@ -28,6 +28,8 @@ 
  * This is so because usb_add_hcd() will start the HC, and thus, all
  * the HC specific stuff has to be already initialized (like sysfs
  * thingies).
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 #include <linux/device.h>
 #include <linux/module.h>
diff --git a/drivers/usb/wusbcore/wusbhc.h b/drivers/usb/wusbcore/wusbhc.h
index 8c5bd000739b..7629e5e20935 100644
--- a/drivers/usb/wusbcore/wusbhc.h
+++ b/drivers/usb/wusbcore/wusbhc.h
@@ -48,6 +48,8 @@ 
  * that, creates a 'struct wusbhc' instance that handles all the
  * common WUSB mechanisms. Links in the function ops that are specific
  * to it and then registers the host controller. Ready to run.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __WUSBHC_H__