From 9a36a66cb7216165bcb5155c9e2b23c1eb91a90c Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sun, 16 Dec 2018 21:19:18 -0800 Subject: PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate Port of a Linux commit 8cfab3cf63cfe5a53e2e566b3b86b30c187edf3a Add SPDX GPL-2.0 to all PCI files that specified the GPL version 2 license. Remove the boilerplate GPL version 2 language, relying on the assertion in b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") that the SPDX identifier may be used instead of the full boilerplate text. Signed-off-by: Bjorn Helgaas Reviewed-by: Greg Kroah-Hartman Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- drivers/pci/pci-imx6.c | 5 +---- drivers/pci/pci-mvebu-phy.c | 5 +---- drivers/pci/pci-mvebu.c | 5 +---- drivers/pci/pci-mvebu.h | 5 +---- drivers/pci/pci-tegra.c | 13 +------------ drivers/pci/pcie-designware-host.c | 5 +---- drivers/pci/pcie-designware.c | 5 +---- drivers/pci/pcie-designware.h | 5 +---- 8 files changed, 8 insertions(+), 40 deletions(-) (limited to 'drivers/pci') diff --git a/drivers/pci/pci-imx6.c b/drivers/pci/pci-imx6.c index 67ef47db9b..78aa5215ad 100644 --- a/drivers/pci/pci-imx6.c +++ b/drivers/pci/pci-imx6.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PCIe host controller driver for Freescale i.MX6 SoCs * @@ -5,10 +6,6 @@ * http://www.kosagi.com * * Author: Sean Cross - * - * 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/pci/pci-mvebu-phy.c b/drivers/pci/pci-mvebu-phy.c index 55a1d39f62..f1bfc99eef 100644 --- a/drivers/pci/pci-mvebu-phy.c +++ b/drivers/pci/pci-mvebu-phy.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SoC specific PCIe PHY setup for Marvell MVEBU SoCs * * Sebastian Hesselbarth * * based on Marvell BSP code (C) Marvell International Ltd. - * - * 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. */ #include diff --git a/drivers/pci/pci-mvebu.c b/drivers/pci/pci-mvebu.c index 91e8ca870b..1c20f91544 100644 --- a/drivers/pci/pci-mvebu.c +++ b/drivers/pci/pci-mvebu.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PCIe driver for Marvell MVEBU SoCs * * Based on Linux drivers/pci/host/pci-mvebu.c - * - * 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. */ #include diff --git a/drivers/pci/pci-mvebu.h b/drivers/pci/pci-mvebu.h index 8ced9fefca..2797bc4c8b 100644 --- a/drivers/pci/pci-mvebu.h +++ b/drivers/pci/pci-mvebu.h @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * PCIe include for Marvell MVEBU SoCs * * Sebastian Hesselbarth - * - * 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. */ #ifndef __MVEBU_PCI_H diff --git a/drivers/pci/pci-tegra.c b/drivers/pci/pci-tegra.c index b532c464a6..b6ccf8e5b5 100644 --- a/drivers/pci/pci-tegra.c +++ b/drivers/pci/pci-tegra.c @@ -1,21 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2014 Lucas Stach * * based on code * Copyright (c) 2010, CompuLab, Ltd. * Copyright (c) 2008-2009, NVIDIA Corporation. - * - * 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. - * - * This program is distributed in the hope 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, see . */ #include diff --git a/drivers/pci/pcie-designware-host.c b/drivers/pci/pcie-designware-host.c index d4fd58377d..29967fbc5d 100644 --- a/drivers/pci/pcie-designware-host.c +++ b/drivers/pci/pcie-designware-host.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Synopsys DesignWare PCIe host controller driver * @@ -5,10 +6,6 @@ * http://www.samsung.com * * Author: Jingoo Han - * - * 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. */ diff --git a/drivers/pci/pcie-designware.c b/drivers/pci/pcie-designware.c index e608ad47ae..6b2458c9f0 100644 --- a/drivers/pci/pcie-designware.c +++ b/drivers/pci/pcie-designware.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Synopsys DesignWare PCIe host controller driver * @@ -5,10 +6,6 @@ * http://www.samsung.com * * Author: Jingoo Han - * - * 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. */ diff --git a/drivers/pci/pcie-designware.h b/drivers/pci/pcie-designware.h index 98565f2010..b18f1b83e7 100644 --- a/drivers/pci/pcie-designware.h +++ b/drivers/pci/pcie-designware.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Synopsys DesignWare PCIe host controller driver * @@ -5,10 +6,6 @@ * http://www.samsung.com * * Author: Jingoo Han - * - * 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. */ #ifndef _PCIE_DESIGNWARE_H -- cgit v1.2.3