Reviewed-by: Steve Winslow <swinslow@xxxxxxxxx> On Tue, May 28, 2019 at 1:16 PM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > > From: Thomas Gleixner tglx@xxxxxxxxxxxxx > > Based on 1 normalized pattern(s): > > 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 > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-only > > has been chosen to replace the boilerplate/reference in 24 file(s). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch9&id=e7beaa05d4e2 > --- > arch/arm/mach-integrator/integrator_cp.c | 5 +---- > arch/arm/mach-w90x900/clock.c | 5 +---- > arch/arm/mach-w90x900/clock.h | 5 +---- > drivers/crypto/mediatek/mtk-regs.h | 6 +----- > drivers/hid/hid-twinhan.c | 4 +--- > drivers/input/keyboard/lm8333.c | 5 +---- > drivers/input/serio/pcips2.c | 5 +---- > drivers/input/serio/sa1111ps2.c | 5 +---- > drivers/mfd/mcp-core.c | 5 +---- > drivers/mfd/mcp-sa11x0.c | 5 +---- > drivers/mfd/ucb1x00-assabet.c | 5 +---- > drivers/mfd/ucb1x00-core.c | 5 +---- > drivers/mmc/host/sdhci-esdhc.h | 5 +---- > drivers/mtd/maps/pismo.c | 5 +---- > drivers/phy/rockchip/phy-rockchip-dp.c | 5 +---- > drivers/pwm/pwm-img.c | 5 +---- > drivers/pwm/pwm-lpc18xx-sct.c | 5 +---- > drivers/pwm/pwm-samsung.c | 5 +---- > include/linux/mfd/mcp.h | 5 +---- > include/linux/mfd/ucb1x00.h | 5 +---- > include/linux/mmc/sh_mmcif.h | 6 +----- > include/linux/mtd/pismo.h | 5 +---- > net/sched/sch_netem.c | 6 +----- > tools/spi/spidev_test.c | 5 +---- > 24 files changed, 24 insertions(+), 98 deletions(-) > > --- a/arch/arm/mach-integrator/integrator_cp.c > +++ b/arch/arm/mach-integrator/integrator_cp.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * linux/arch/arm/mach-integrator/integrator_cp.c > * > * Copyright (C) 2003 Deep Blue Solutions Ltd > - * > - * 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. > */ > #include <linux/kernel.h> > #include <linux/amba/mmci.h> > --- a/arch/arm/mach-w90x900/clock.c > +++ b/arch/arm/mach-w90x900/clock.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * linux/arch/arm/mach-w90x900/clock.c > * > * Copyright (c) 2008 Nuvoton technology corporation > * > * Wan ZongShun <mcuos.com@xxxxxxxxx> > - * > - * 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. > */ > > #include <linux/module.h> > --- a/arch/arm/mach-w90x900/clock.h > +++ b/arch/arm/mach-w90x900/clock.h > @@ -1,13 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * linux/arch/arm/mach-w90x900/clock.h > * > * Copyright (c) 2008 Nuvoton technology corporation > * > * Wan ZongShun <mcuos.com@xxxxxxxxx> > - * > - * 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. > */ > > #include <linux/clkdev.h> > --- a/drivers/crypto/mediatek/mtk-regs.h > +++ b/drivers/crypto/mediatek/mtk-regs.h > @@ -1,13 +1,9 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Support for MediaTek cryptographic accelerator. > * > * Copyright (c) 2016 MediaTek Inc. > * Author: Ryder Lee <ryder.lee@xxxxxxxxxxxx> > - * > - * 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. > - * > */ > > #ifndef __MTK_REGS_H__ > --- a/drivers/hid/hid-twinhan.c > +++ b/drivers/hid/hid-twinhan.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * HID driver for TwinHan IR remote control > * > @@ -7,9 +8,6 @@ > */ > > /* > - * 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. > */ > > #include <linux/device.h> > --- a/drivers/input/keyboard/lm8333.c > +++ b/drivers/input/keyboard/lm8333.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * LM8333 keypad driver > * Copyright (C) 2012 Wolfram Sang, Pengutronix <kernel@xxxxxxxxxxxxxx> > - * > - * 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. > */ > > #include <linux/module.h> > --- a/drivers/input/serio/pcips2.c > +++ b/drivers/input/serio/pcips2.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * linux/drivers/input/serio/pcips2.c > * > * Copyright (C) 2003 Russell King, All Rights Reserved. > * > - * 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. > - * > * I'm not sure if this is a generic PS/2 PCI interface or specific to > * the Mobility Electronics docking station. > */ > --- a/drivers/input/serio/sa1111ps2.c > +++ b/drivers/input/serio/sa1111ps2.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * linux/drivers/input/serio/sa1111ps2.c > * > * Copyright (C) 2002 Russell King > - * > - * 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. > */ > #include <linux/module.h> > #include <linux/init.h> > --- a/drivers/mfd/mcp-core.c > +++ b/drivers/mfd/mcp-core.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * linux/drivers/mfd/mcp-core.c > * > * Copyright (C) 2001 Russell King > * > - * 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. > - * > * Generic MCP (Multimedia Communications Port) layer. All MCP locking > * is solely held within this file. > */ > --- a/drivers/mfd/mcp-sa11x0.c > +++ b/drivers/mfd/mcp-sa11x0.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * linux/drivers/mfd/mcp-sa11x0.c > * > * Copyright (C) 2001-2005 Russell King > * > - * 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. > - * > * SA11x0 MCP (Multimedia Communications Port) driver. > * > * MCP read/write timeouts from Jordi Colomer, rehacked by rmk. > --- a/drivers/mfd/ucb1x00-assabet.c > +++ b/drivers/mfd/ucb1x00-assabet.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * linux/drivers/mfd/ucb1x00-assabet.c > * > * Copyright (C) 2001-2003 Russell King, All Rights Reserved. > * > - * 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. > - * > * We handle the machine-specific bits of the UCB1x00 driver here. > */ > #include <linux/module.h> > --- a/drivers/mfd/ucb1x00-core.c > +++ b/drivers/mfd/ucb1x00-core.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * linux/drivers/mfd/ucb1x00-core.c > * > * Copyright (C) 2001 Russell King, All Rights Reserved. > * > - * 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. > - * > * The UCB1x00 core driver provides basic services for handling IO, > * the ADC, interrupts, and accessing registers. It is designed > * such that everything goes through this layer, thereby providing > --- a/drivers/mmc/host/sdhci-esdhc.h > +++ b/drivers/mmc/host/sdhci-esdhc.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Freescale eSDHC controller driver generics for OF and pltfm. > * > @@ -5,10 +6,6 @@ > * Copyright (c) 2009 MontaVista Software, Inc. > * Copyright (c) 2010 Pengutronix e.K. > * Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> > - * > - * 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. > */ > > #ifndef _DRIVERS_MMC_SDHCI_ESDHC_H > --- a/drivers/mtd/maps/pismo.c > +++ b/drivers/mtd/maps/pismo.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * PISMO memory driver - http://www.pismoworld.org/ > * > * For ARM Realview and Versatile platforms > - * > - * 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. > */ > #include <linux/init.h> > #include <linux/module.h> > --- a/drivers/phy/rockchip/phy-rockchip-dp.c > +++ b/drivers/phy/rockchip/phy-rockchip-dp.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Rockchip DP PHY driver > * > * Copyright (C) 2016 FuZhou Rockchip Co., Ltd. > * Author: Yakir Yang <ykk@@rock-chips.com> > - * > - * 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. > */ > > #include <linux/clk.h> > --- a/drivers/pwm/pwm-img.c > +++ b/drivers/pwm/pwm-img.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Imagination Technologies Pulse Width Modulator driver > * > * Copyright (c) 2014-2015, Imagination Technologies > * > * Based on drivers/pwm/pwm-tegra.c, Copyright (c) 2010, NVIDIA Corporation > - * > - * 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. > */ > > #include <linux/clk.h> > --- a/drivers/pwm/pwm-lpc18xx-sct.c > +++ b/drivers/pwm/pwm-lpc18xx-sct.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * NXP LPC18xx State Configurable Timer - Pulse Width Modulator driver > * > * Copyright (c) 2015 Ariel D'Alessandro <ariel@xxxxxxxxxxxxxxxxx> > * > - * 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. > - * > * Notes > * ===== > * NXP LPC18xx provides a State Configurable Timer (SCT) which can be configured > --- a/drivers/pwm/pwm-samsung.c > +++ b/drivers/pwm/pwm-samsung.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2007 Ben Dooks > * Copyright (c) 2008 Simtec Electronics > @@ -6,10 +7,6 @@ > * Copyright (c) 2017 Samsung Electronics Co., Ltd. > * > * PWM driver for Samsung SoCs > - * > - * 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. > */ > > #include <linux/bitops.h> > --- a/include/linux/mfd/mcp.h > +++ b/include/linux/mfd/mcp.h > @@ -1,11 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * linux/drivers/mfd/mcp.h > * > * Copyright (C) 2001 Russell King, All Rights Reserved. > - * > - * 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. > */ > #ifndef MCP_H > #define MCP_H > --- a/include/linux/mfd/ucb1x00.h > +++ b/include/linux/mfd/ucb1x00.h > @@ -1,11 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * linux/include/mfd/ucb1x00.h > * > * Copyright (C) 2001 Russell King, All Rights Reserved. > - * > - * 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. > */ > #ifndef UCB1200_H > #define UCB1200_H > --- a/include/linux/mmc/sh_mmcif.h > +++ b/include/linux/mmc/sh_mmcif.h > @@ -1,14 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * include/linux/mmc/sh_mmcif.h > * > * platform data for eMMC driver > * > * Copyright (C) 2010 Renesas Solutions Corp. > - * > - * 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. > - * > */ > > #ifndef LINUX_MMC_SH_MMCIF_H > --- a/include/linux/mtd/pismo.h > +++ b/include/linux/mtd/pismo.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * PISMO memory driver - http://www.pismoworld.org/ > - * > - * 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. > */ > #ifndef __LINUX_MTD_PISMO_H > #define __LINUX_MTD_PISMO_H > --- a/net/sched/sch_netem.c > +++ b/net/sched/sch_netem.c > @@ -1,11 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * net/sched/sch_netem.c Network emulator > * > - * 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. > - * > * Many of the algorithms and ideas for this came from > * NIST Net which is not copyrighted. > * > --- a/tools/spi/spidev_test.c > +++ b/tools/spi/spidev_test.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * SPI testing utility (using spidev driver) > * > * Copyright (c) 2007 MontaVista Software, Inc. > * Copyright (c) 2007 Anton Vorontsov <avorontsov@xxxxxxxxxxxxx> > * > - * 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. > - * > * Cross-compile with cross-gcc -I/path/to/cross-kernel/include > */ > > > -- Steve Winslow Director of Strategic Programs The Linux Foundation swinslow@xxxxxxxxxxxxxxxxxxx
