From 5fd54ace4721fc5ce2bb5aef6318fcf17f421460 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Nov 2017 11:28:30 +0100 Subject: USB: add SPDX identifiers to all remaining files in drivers/usb/ It's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses. Update the drivers/usb/ and include/linux/usb* files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text. This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart. Cc: Thomas Gleixner Cc: Kate Stewart Cc: Philippe Ombredanne Signed-off-by: Greg Kroah-Hartman Acked-by: Felipe Balbi Acked-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/usb/common/common.c | 1 + drivers/usb/common/led.c | 1 + drivers/usb/common/ulpi.c | 1 + drivers/usb/common/usb-otg-fsm.c | 1 + 4 files changed, 4 insertions(+) (limited to 'drivers/usb/common') diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index 552ff7ac5a6b..2b45b0517b3d 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Provides code common for host and device side USB. * diff --git a/drivers/usb/common/led.c b/drivers/usb/common/led.c index df23da00a901..fd5538c8e067 100644 --- a/drivers/usb/common/led.c +++ b/drivers/usb/common/led.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * LED Triggers for USB Activity * diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index 4aa5195db8ea..73c38258eec7 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * ulpi.c - USB ULPI PHY bus * diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c index b8fe31e409a5..f960d5374ee0 100644 --- a/drivers/usb/common/usb-otg-fsm.c +++ b/drivers/usb/common/usb-otg-fsm.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * OTG Finite State Machine from OTG spec * -- cgit v1.2.3 From 366122afb8198d4d6a9bd4301eabbe8282691e93 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Nov 2017 12:41:03 +0100 Subject: USB: common: Remove redundant license text Now that the SPDX tag is in all USB files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording can be removed as it is no longer needed at all. This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF which is never needed. No copyright headers or other non-license-description text was removed. Cc: Heikki Krogerus Cc: Peter Chen Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/common/common.c | 4 ---- drivers/usb/common/led.c | 5 ----- drivers/usb/common/ulpi.c | 4 ---- drivers/usb/common/usb-otg-fsm.c | 14 -------------- 4 files changed, 27 deletions(-) (limited to 'drivers/usb/common') diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index 2b45b0517b3d..50a2362ed3ea 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -2,10 +2,6 @@ /* * Provides code common for host and device side USB. * - * 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. - * * If either host side (ie. CONFIG_USB=y) or device side USB stack * (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 diff --git a/drivers/usb/common/led.c b/drivers/usb/common/led.c index fd5538c8e067..7bd81166b77d 100644 --- a/drivers/usb/common/led.c +++ b/drivers/usb/common/led.c @@ -3,11 +3,6 @@ * LED Triggers for USB Activity * * Copyright 2014 Michal Sojka - * - * 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. - * */ #include diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index 73c38258eec7..8b351444cc40 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -5,10 +5,6 @@ * Copyright (C) 2015 Intel Corporation * * Author: Heikki Krogerus - * - * 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. */ #include diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c index f960d5374ee0..3740cf95560e 100644 --- a/drivers/usb/common/usb-otg-fsm.c +++ b/drivers/usb/common/usb-otg-fsm.c @@ -6,20 +6,6 @@ * * Author: Li Yang * Jerry Huang - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. */ #include -- cgit v1.2.3