watchdog: add SPDX identifiers for watchdog subsystem
Subsystems (38)
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
- Add SPDX identifier
- Remove boiler plate license text
- If MODULE_LICENSE and boiler plate does not match, go for boiler plate license
Signed-off-by Marcus Folkesson <[email protected]>
Acked-by Adam Thomson <[email protected]>
Acked-by Charles Keepax <[email protected]>
Acked-by Nicolas Ferre <[email protected]>
Acked-by Michal Simek <[email protected]>
---
Notes:
v2:
- Put back removed copyright texts for meson_gxbb_wdt and coh901327_wdt
- Change to BSD-3-Clause for meson_gxbb_wdt
v1: Please have an extra look at meson_gxbb_wdt.c
drivers/watchdog/acquirewdt.c | 6 +--- drivers/watchdog/advantechwdt.c | 6 +--- drivers/watchdog/alim1535_wdt.c | 6 +--- drivers/watchdog/alim7101_wdt.c | 1 + drivers/watchdog/ar7_wdt.c | 14 +--------- drivers/watchdog/asm9260_wdt.c | 2 +- drivers/watchdog/aspeed_wdt.c | 5 +--- drivers/watchdog/at91rm9200_wdt.c | 5 +--- drivers/watchdog/at91sam9_wdt.c | 5 +--- drivers/watchdog/at91sam9_wdt.h | 5 +--- drivers/watchdog/ath79_wdt.c | 4 +-- drivers/watchdog/atlas7_wdt.c | 2 +- drivers/watchdog/bcm2835_wdt.c | 5 +--- drivers/watchdog/bcm47xx_wdt.c | 5 +--- drivers/watchdog/bcm63xx_wdt.c | 5 +--- drivers/watchdog/bcm7038_wdt.c | 12 ++------ drivers/watchdog/bcm_kona_wdt.c | 9 +----- drivers/watchdog/bfin_wdt.c | 2 +- drivers/watchdog/booke_wdt.c | 5 +--- drivers/watchdog/cadence_wdt.c | 5 +--- drivers/watchdog/coh901327_wdt.c | 4 +-- drivers/watchdog/cpu5wdt.c | 15 +--------- drivers/watchdog/cpwd.c | 1 + drivers/watchdog/da9052_wdt.c | 6 +--- drivers/watchdog/da9055_wdt.c | 6 +--- drivers/watchdog/da9062_wdt.c | 10 +------ drivers/watchdog/da9063_wdt.c | 5 +--- drivers/watchdog/davinci_wdt.c | 7 ++--- drivers/watchdog/diag288_wdt.c | 1 + drivers/watchdog/digicolor_wdt.c | 5 +--- drivers/watchdog/dw_wdt.c | 6 +--- drivers/watchdog/ebc-c384_wdt.c | 9 +----- drivers/watchdog/ep93xx_wdt.c | 7 ++--- drivers/watchdog/eurotechwdt.c | 6 +--- drivers/watchdog/f71808e_wdt.c | 16 +---------- drivers/watchdog/ftwdt010_wdt.c | 6 ++-- drivers/watchdog/gef_wdt.c | 6 +--- drivers/watchdog/geodewdt.c | 5 +--- drivers/watchdog/gpio_wdt.c | 5 +--- drivers/watchdog/hpwdt.c | 7 ++--- drivers/watchdog/i6300esb.c | 6 +--- drivers/watchdog/iTCO_vendor_support.c | 9 +----- drivers/watchdog/iTCO_wdt.c | 10 +------ drivers/watchdog/ib700wdt.c | 6 +--- drivers/watchdog/ibmasr.c | 3 +- drivers/watchdog/ie6xx_wdt.c | 18 ++---------- drivers/watchdog/imgpdc_wdt.c | 5 +--- drivers/watchdog/imx2_wdt.c | 5 +--- drivers/watchdog/indydog.c | 6 +--- drivers/watchdog/intel-mid_wdt.c | 6 ++-- drivers/watchdog/intel_scu_watchdog.c | 18 ++---------- drivers/watchdog/intel_scu_watchdog.h | 16 +---------- drivers/watchdog/iop_wdt.c | 16 ++--------- drivers/watchdog/it8712f_wdt.c | 10 +------ drivers/watchdog/it87_wdt.c | 10 +------ drivers/watchdog/ixp4xx_wdt.c | 6 ++-- drivers/watchdog/jz4740_wdt.c | 10 +------ drivers/watchdog/kempld_wdt.c | 12 ++------ drivers/watchdog/ks8695_wdt.c | 6 ++-- drivers/watchdog/lantiq_wdt.c | 7 ++--- drivers/watchdog/loongson1_wdt.c | 5 +--- drivers/watchdog/lpc18xx_wdt.c | 5 +--- drivers/watchdog/m54xx_wdt.c | 6 ++-- drivers/watchdog/machzwd.c | 11 +------- drivers/watchdog/max63xx_wdt.c | 5 +--- drivers/watchdog/max77620_wdt.c | 5 +--- drivers/watchdog/mei_wdt.c | 12 ++------ drivers/watchdog/mena21_wdt.c | 4 +-- drivers/watchdog/menf21bmc_wdt.c | 8 ++---- drivers/watchdog/meson_gxbb_wdt.c | 50 +--------------------------------- drivers/watchdog/meson_wdt.c | 6 +--- drivers/watchdog/mixcomwd.c | 6 +--- drivers/watchdog/moxart_wdt.c | 7 ++--- drivers/watchdog/mpc8xxx_wdt.c | 6 +--- drivers/watchdog/mt7621_wdt.c | 5 +--- drivers/watchdog/mtk_wdt.c | 11 +------- drivers/watchdog/mtx-1_wdt.c | 11 +------- drivers/watchdog/mv64x60_wdt.c | 6 ++-- drivers/watchdog/ni903x_wdt.c | 11 +------- drivers/watchdog/nic7018_wdt.c | 11 +------- drivers/watchdog/nuc900_wdt.c | 7 ++--- drivers/watchdog/nv_tco.c | 6 +--- drivers/watchdog/nv_tco.h | 10 +------ drivers/watchdog/octeon-wdt-main.c | 11 +------- drivers/watchdog/octeon-wdt-nmi.S | 5 +--- drivers/watchdog/of_xilinx_wdt.c | 8 ++---- drivers/watchdog/omap_wdt.c | 1 + drivers/watchdog/omap_wdt.h | 21 +------------- drivers/watchdog/orion_wdt.c | 5 +--- drivers/watchdog/pc87413_wdt.c | 10 +------ drivers/watchdog/pcwd.c | 1 + drivers/watchdog/pcwd_pci.c | 10 +------ drivers/watchdog/pcwd_usb.c | 10 +------ drivers/watchdog/pic32-dmt.c | 5 +--- drivers/watchdog/pic32-wdt.c | 6 +--- drivers/watchdog/pika_wdt.c | 1 + drivers/watchdog/pnx4008_wdt.c | 7 ++--- drivers/watchdog/pnx833x_wdt.c | 6 +--- drivers/watchdog/pretimeout_noop.c | 7 +---- drivers/watchdog/pretimeout_panic.c | 7 +---- drivers/watchdog/qcom-wdt.c | 14 ++-------- drivers/watchdog/renesas_wdt.c | 4 +-- drivers/watchdog/retu_wdt.c | 10 +------ drivers/watchdog/riowd.c | 1 + drivers/watchdog/rn5t618_wdt.c | 8 +----- drivers/watchdog/rt2880_wdt.c | 5 +--- drivers/watchdog/rtd119x_wdt.c | 2 +- drivers/watchdog/rza_wdt.c | 5 +--- drivers/watchdog/s3c2410_wdt.c | 11 +------- drivers/watchdog/sa1100_wdt.c | 11 +------- drivers/watchdog/sama5d4_wdt.c | 3 +- drivers/watchdog/sb_wdog.c | 5 +--- drivers/watchdog/sbc60xxwdt.c | 10 +------ drivers/watchdog/sbc7240_wdt.c | 12 ++------ drivers/watchdog/sbc8360.c | 10 +------ drivers/watchdog/sbc_epx_c3.c | 6 +--- drivers/watchdog/sbc_fitpc2_wdt.c | 7 ++--- drivers/watchdog/sbsa_gwdt.c | 10 +------ drivers/watchdog/sc1200wdt.c | 10 +------ drivers/watchdog/sc520_wdt.c | 10 +------ drivers/watchdog/sch311x_wdt.c | 10 +------ drivers/watchdog/scx200_wdt.c | 10 ++----- drivers/watchdog/shwdt.c | 6 +--- drivers/watchdog/sirfsoc_wdt.c | 5 ++-- drivers/watchdog/smsc37b787_wdt.c | 10 +------ drivers/watchdog/softdog.c | 10 +------ drivers/watchdog/sp5100_tco.c | 6 +--- drivers/watchdog/sp805_wdt.c | 5 +--- drivers/watchdog/sprd_wdt.c | 10 +------ drivers/watchdog/st_lpc_wdt.c | 6 +--- drivers/watchdog/stmp3xxx_rtc_wdt.c | 5 +--- drivers/watchdog/sun4v_wdt.c | 6 +--- drivers/watchdog/sunxi_wdt.c | 6 +--- drivers/watchdog/tangox_wdt.c | 6 +--- drivers/watchdog/tegra_wdt.c | 10 +------ drivers/watchdog/ts4800_wdt.c | 5 +--- drivers/watchdog/ts72xx_wdt.c | 7 ++--- drivers/watchdog/twl4030_wdt.c | 15 +--------- drivers/watchdog/txx9wdt.c | 9 ++---- drivers/watchdog/uniphier_wdt.c | 10 +------ drivers/watchdog/ux500_wdt.c | 5 ++-- drivers/watchdog/via_wdt.c | 4 +-- drivers/watchdog/w83627hf_wdt.c | 10 +------ drivers/watchdog/w83877f_wdt.c | 10 +------ drivers/watchdog/w83977f_wdt.c | 9 +----- drivers/watchdog/wafer5823wdt.c | 11 +------- drivers/watchdog/watchdog_core.c | 10 +------ drivers/watchdog/watchdog_core.h | 10 +------ drivers/watchdog/watchdog_dev.c | 10 +------ drivers/watchdog/watchdog_pretimeout.c | 6 +--- drivers/watchdog/wd501p.h | 1 + drivers/watchdog/wdat_wdt.c | 5 +--- drivers/watchdog/wdrtas.c | 15 +--------- drivers/watchdog/wdt.c | 11 +------- drivers/watchdog/wdt285.c | 7 +---- drivers/watchdog/wdt977.c | 8 +----- drivers/watchdog/wdt_pci.c | 11 +------- drivers/watchdog/wm831x_wdt.c | 5 +--- drivers/watchdog/wm8350_wdt.c | 5 +--- drivers/watchdog/xen_wdt.c | 6 +--- drivers/watchdog/ziirave_wdt.c | 11 +------- drivers/watchdog/zx2967_wdt.c | 3 +- 162 files changed, 195 insertions(+), 1051 deletions(-)
drivers/watchdog/acquirewdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Acquire Single Board Computer Watchdog Timer driver *
@@ -6,11 +7,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* * Neither Alan Cox nor CymruNet Ltd. admit liability nor provide * warranty for any of this software. This material is provided * "AS-IS" and at no charge.
drivers/watchdog/advantechwdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Advantech Single Board Computer WDT driver *
@@ -9,11 +10,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* * Neither Alan Cox nor CymruNet Ltd. admit liability nor provide * warranty for any of this software. This material is provided * "AS-IS" and at no charge.
drivers/watchdog/alim1535_wdt.c +1 -5
@@ -1,10 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog for the 7101 PMU version found in the ALi M1535 chipsets -* -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/alim7101_wdt.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * ALi M7101 PMU Computer Watchdog Timer driver *
drivers/watchdog/ar7_wdt.c +1 -13
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/watchdog/ar7_wdt.c *
@@ -8,19 +9,6 @@* National Semiconductor SCx200 Watchdog support * Copyright (c) 2001,2002 Christer Weinigel <[email protected]> * -* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/asm9260_wdt.c +1 -1
@@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for Alphascale ASM9260. * * Copyright (c) 2014 Oleksij Rempel <[email protected]> * -* Licensed under GPLv2 or later. */ #include <linux/bitops.h>
drivers/watchdog/aspeed_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 IBM Corporation * * Joel Stanley <[email protected]> * -* 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. */ #include <linux/delay.h>
drivers/watchdog/at91rm9200_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for Atmel AT91RM9200 (Thunder) * * Copyright (C) 2003 SAN People (Pty) 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, or (at your option) any later version. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/at91sam9_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for Atmel AT91SAM9x processors. * * Copyright (C) 2008 Renaud CERRATO r.cerrato at til-technologies.fr * -* 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. */ /*
drivers/watchdog/at91sam9_wdt.h +1 -4
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * drivers/watchdog/at91sam9_wdt.h *
@@ -7,10 +8,6 @@* Watchdog Timer (WDT) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. * -* 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. */ #ifndef AT91_WDT_H
drivers/watchdog/ath79_wdt.c +1 -3
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Atheros AR71XX/AR724X/AR913X built-in hardware watchdog timer. *
@@ -11,9 +12,6 @@* which again was based on sa1100 driver, * Copyright (C) 2000 Oleg Drokin <[email protected]> * -* 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. * */
drivers/watchdog/atlas7_wdt.c +1 -1
@@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for CSR Atlas7 * * Copyright (c) 2015 Cambridge Silicon Radio Limited, a CSR plc group company. * -* Licensed under GPLv2. */ #include <linux/clk.h>
drivers/watchdog/bcm2835_wdt.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for Broadcom BCM2835 *
@@ -7,10 +8,6 @@* * Copyright (C) 2013 Lubomir Rintel <[email protected]> * -* 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. */ #include <linux/delay.h>
drivers/watchdog/bcm47xx_wdt.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for Broadcom BCM47XX *
@@ -5,10 +6,6 @@* Copyright (C) 2009 Matthieu CASTET <[email protected]> * Copyright (C) 2012-2013 Hauke Mehrtens <[email protected]> * -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/bcm63xx_wdt.c +1 -4
@@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Broadcom BCM63xx SoC watchdog driver * * Copyright (C) 2007, Miguel Gaio <[email protected]> * Copyright (C) 2008, Florian Fainelli <[email protected]> * -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/bcm7038_wdt.c +2 -10
@@ -1,15 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Broadcom 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, 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. */ #include <linux/clk.h>
@@ -235,6 +227,6 @@ module_platform_driver(bcm7038_wdt_driver);module_param (nowayout, bool,0 ); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Driver for Broadcom 7038 SoCs Watchdog" );MODULE_AUTHOR ("Justin Chen" );
drivers/watchdog/bcm_kona_wdt.c +1 -8
@@ -1,14 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2013 Broadcom 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 version 2. -* -* This program is distributed "as is" WITHOUT ANY WARRANTY of any -* 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. */ #include <linux/debugfs.h>
drivers/watchdog/bfin_wdt.c +1 -1
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Blackfin On-Chip Watchdog Driver *
@@ -8,7 +9,6 @@* * Enter bugs at http://blackfin.uclinux.org/ * -* Licensed under the GPL-2 or later. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/booke_wdt.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog timer for PowerPC Book-E systems *
@@ -6,10 +7,6 @@* * Copyright 2005, 2008, 2010-2011 Freescale Semiconductor Inc. * -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/cadence_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cadence WDT driver - Used by Xilinx Zynq * * Copyright (C) 2010 - 2014 Xilinx, Inc. * -* 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. */ #include <linux/clk.h>
drivers/watchdog/coh901327_wdt.c +2 -2
@@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * coh901327_wdt.c * * Copyright (C) 2008-2009 ST-Ericsson AB -* License terms: GNU General Public License (GPL) version 2 * Watchdog driver for the ST-Ericsson AB COH 901 327 IP core * Author: Linus Walleij <[email protected]> */
@@ -419,5 +419,5 @@ MODULE_DESCRIPTION("COH 901 327 Watchdog");module_param (margin, uint,0 );MODULE_PARM_DESC (margin,"Watchdog margin in seconds (default 60s)" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:coh901327-watchdog" );
drivers/watchdog/cpu5wdt.c +1 -14
@@ -1,22 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * sma cpu5 watchdog driver * * Copyright (C) 2003 Heiko Ronsdorf <[email protected]> * -* 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. -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/cpwd.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* cpwd.c - driver implementation for hardware watchdog * timers found on Sun Microsystems CP1400 and CP1500 boards. *
drivers/watchdog/da9052_wdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * System monitoring driver for DA9052 PMICs. *
@@ -5,11 +6,6 @@* * Author: Anthony Olech <[email protected]> * -* 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. -* */ #include <linux/module.h>
drivers/watchdog/da9055_wdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * System monitoring driver for DA9055 PMICs. *
@@ -5,11 +6,6 @@* * Author: David Dajun Chen <[email protected]> * -* 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. -* */ #include <linux/module.h>
drivers/watchdog/da9062_wdt.c +1 -9
@@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog device driver for DA9062 and DA9061 PMICs * Copyright (C) 2015 Dialog Semiconductor 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, 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. */ #include <linux/kernel.h>
drivers/watchdog/da9063_wdt.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for DA9063 PMICs. *
@@ -5,10 +6,6 @@* * Author: Mariusz Wojtasik <[email protected]> * -* 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. */ #include <linux/kernel.h>
drivers/watchdog/davinci_wdt.c +2 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * drivers/char/watchdog/davinci_wdt.c *
@@ -5,10 +6,6 @@* * Copyright (C) 2006-2013 Texas Instruments. * -* 2007 (c) MontaVista Software, Inc. 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 <linux/module.h>
@@ -284,5 +281,5 @@ MODULE_PARM_DESC(heartbeat, __MODULE_STRING(MAX_HEARTBEAT) ", default " __MODULE_STRING(DEFAULT_HEARTBEAT)); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:davinci-wdt" );
drivers/watchdog/diag288_wdt.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for z/VM and LPAR using the diag 288 interface. *
drivers/watchdog/digicolor_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for Conexant Digicolor * * Copyright (C) 2015 Paradox Innovation 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, or (at your -* option) any later version. */ #include <linux/types.h>
drivers/watchdog/dw_wdt.c +1 -5
@@ -1,12 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2010-2011 Picochip Ltd., Jamie Iles * http://www.picochip.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, or (at your option) any later version. -* * This file implements a driver for the Synopsys DesignWare watchdog device * in the many subsystems. The watchdog has 16 different timeout periods * and these are a function of the input clock frequency.
drivers/watchdog/ebc-c384_wdt.c +1 -8
@@ -1,15 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog timer driver for the WinSystems EBC-C384 * Copyright (C) 2016 William Breathitt Gray * -* 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. -* -* 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. */ #include <linux/device.h> #include <linux/dmi.h>
drivers/watchdog/ep93xx_wdt.c +2 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for Cirrus Logic EP93xx family of devices. *
@@ -11,10 +12,6 @@* Copyright (c) 2012 H Hartley Sweeten <[email protected]> * Convert to a platform device and use the watchdog framework API * -* 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. -* * This watchdog fires after 250msec, which is a too short interval * for us to rely on the user space daemon alone. So we ping the * wdt each ~200msec and eventually stop doing it if the user space
@@ -144,4 +141,4 @@ MODULE_AUTHOR("Ray Lehtiniemi <[email protected]>");MODULE_AUTHOR ("Alessandro Zummo <[email protected]>" );MODULE_AUTHOR ("H Hartley Sweeten <[email protected]>" );MODULE_DESCRIPTION ("EP93xx Watchdog" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/eurotechwdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Eurotech CPU-1220/1410/1420 on board WDT driver *
@@ -11,11 +12,6 @@* (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* * Neither Alan Cox nor CymruNet Ltd. admit liability nor provide * warranty for any of this software. This material is provided * "AS-IS" and at no charge.
drivers/watchdog/f71808e_wdt.c +1 -15
@@ -1,22 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /*************************************************************************** * Copyright (C) 2006 by Hans Edgington <[email protected]> * * Copyright (C) 2007-2009 Hans de Goede <[email protected]> * * Copyright (C) 2010 Giel van Schijndel <[email protected]> * -* * -* 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., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/ftwdt010_wdt.c +2 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for Faraday Technology FTWDT010 *
@@ -6,9 +7,6 @@* Inspired by the out-of-tree drivers from OpenWRT: * Copyright (C) 2009 Paulius Zaleckas <[email protected]> * -* 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 <linux/bitops.h>
@@ -233,4 +231,4 @@ static struct platform_driver ftwdt010_wdt_driver = {module_platform_driver (ftwdt010_wdt_driver);MODULE_AUTHOR ("Linus Walleij" );MODULE_DESCRIPTION ("Watchdog driver for Faraday Technology FTWDT010" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/gef_wdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * GE watchdog userspace interface *
@@ -5,11 +6,6 @@* * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. * -* 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. -* * Based on: mv64x60_wdt.c (MV64X60 watchdog userspace interface) * Author: James Chapman <[email protected]> */
drivers/watchdog/geodewdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* Watchdog timer for machines with the CS5535/CS5536 companion chip * * Copyright (C) 2006-2007, Advanced Micro Devices, Inc. * Copyright (C) 2009 Andres Salomon <[email protected]> * -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/gpio_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Driver for watchdog device controlled through GPIO-line * * Author: 2013, Alexander Shiyan <[email protected]> * -* 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. */ #include <linux/err.h>
drivers/watchdog/hpwdt.c +2 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * HPE WatchDog Driver * based on
@@ -7,10 +8,6 @@* (c) Copyright 2015 Hewlett Packard Enterprise Development LP * Thomas Mingarelli <[email protected]> * -* 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 -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
@@ -909,7 +906,7 @@ static struct pci_driver hpwdt_driver = {MODULE_AUTHOR ("Tom Mingarelli" );MODULE_DESCRIPTION ("hp watchdog driver" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_VERSION (HPWDT_VERSION );module_param (soft_margin, int,0 );
drivers/watchdog/i6300esb.c +1 -5
@@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * i6300esb: Watchdog timer driver for Intel 6300ESB chipset * * (c) Copyright 2004 Google Inc. * (c) Copyright 2005 David H?rdeman <[email protected]> * -* 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. -* * based on i810-tco.c which is in turn based on softdog.c * * The timer is implemented in the following I/O controller hubs:
drivers/watchdog/iTCO_vendor_support.c +1 -8
@@ -1,16 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * intel TCO vendor specific watchdog driver support * * (c) Copyright 2006-2009 Wim Van Sebroeck <[email protected]>. * -* 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. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /*
drivers/watchdog/iTCO_wdt.c +1 -9
@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * intel TCO Watchdog Driver * * (c) Copyright 2006-2011 Wim Van Sebroeck <[email protected]>. * -* 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. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. -* * The TCO watchdog is implemented in the following I/O controller hubs: * (See the intel documentation on http://developer.intel.com.) * document number 290655-003, 290677-014: 82801AA (ICH), 82801AB (ICHO)
drivers/watchdog/ib700wdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IB700 Single Board Computer WDT driver *
@@ -14,11 +15,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* * Neither Alan Cox nor CymruNet Ltd. admit liability nor provide * warranty for any of this software. This material is provided * "AS-IS" and at no charge.
drivers/watchdog/ibmasr.c +1 -2
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IBM Automatic Server Restart driver. *
@@ -6,8 +7,6 @@* Based on driver written by Pete Reynolds. * Copyright (c) IBM Corporation, 1998-2004. * -* This software may be used and distributed according to the terms -* of the GNU Public License, incorporated herein by reference. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/ie6xx_wdt.c +2 -16
@@ -1,24 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Intel Atom E6xx Watchdog driver * * Copyright (C) 2011 Alexander Stein * <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General -* Public License as published by the Free Software Foundation. -* -* 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., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* The full GNU General Public License is included in this -* distribution in the file called COPYING. -* */ #include <linux/module.h>
@@ -342,5 +328,5 @@ module_exit(ie6xx_wdt_exit);MODULE_AUTHOR ("Alexander Stein <[email protected]>" );MODULE_DESCRIPTION ("Intel Atom E6xx Watchdog Device Driver" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:" DRIVER_NAME );
drivers/watchdog/imgpdc_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Imagination Technologies PowerDown Controller Watchdog Timer. * * Copyright (c) 2014 Imagination Technologies Ltd. * -* 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. -* * Based on drivers/watchdog/sunxi_wdt.c Copyright (c) 2013 Carlo Caione * 2012 Henrik Nordstrom *
drivers/watchdog/imx2_wdt.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for IMX2 and later processors *
@@ -7,10 +8,6 @@* some parts adapted by similar drivers from Darius Augulis and Vladimir * Zapolskiy, additional improvements by Wim Van Sebroeck. * -* 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. -* * NOTE: MX1 has a slightly different Watchdog than MX2 and later: * * MX1: MX2+:
drivers/watchdog/indydog.c +1 -5
@@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IndyDog 0.3 A Hardware Watchdog Device for SGI IP22 * * (c) Copyright 2002 Guido Guenther <[email protected]>, * 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, or (at your option) any later version. -* * based on softdog.c by Alan Cox <[email protected]> */
drivers/watchdog/intel-mid_wdt.c +2 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * intel-mid_wdt: generic Intel MID SCU watchdog driver *
@@ -7,9 +8,6 @@* Copyright (C) 2014 Intel Corporation. All rights reserved. * Contact: David Cohen <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General -* Public License as published by the Free Software Foundation. */ #include <linux/interrupt.h>
@@ -185,4 +183,4 @@ module_platform_driver(mid_wdt_driver);MODULE_AUTHOR ("David Cohen <[email protected]>" );MODULE_DESCRIPTION ("Watchdog Driver for Intel MID platform" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/intel_scu_watchdog.c +2 -16
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Intel_SCU 0.2: An Intel SCU IOH Based Watchdog Device * for Intel part #(s):
@@ -5,21 +6,6 @@* * Copyright (C) 2009-2010 Intel Corporation. All rights reserved. * -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General -* Public License as published by the Free Software Foundation. -* -* 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., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* The full GNU General Public License is included in this -* distribution in the file called COPYING. -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
@@ -561,5 +547,5 @@ module_exit(intel_scu_watchdog_exit);MODULE_AUTHOR ("Intel Corporation" );MODULE_DESCRIPTION ("Intel SCU Watchdog Device Driver" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_VERSION (WDT_VER );
drivers/watchdog/intel_scu_watchdog.h +1 -15
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Intel_SCU 0.2: An Intel SCU IOH Based Watchdog Device * for Intel part #(s):
@@ -5,21 +6,6 @@* * Copyright (C) 2009-2010 Intel Corporation. All rights reserved. * -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General -* Public License as published by the Free Software Foundation. -* -* 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., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* The full GNU General Public License is included in this -* distribution in the file called COPYING. -* */ #ifndef __INTEL_SCU_WATCHDOG_H
drivers/watchdog/iop_wdt.c +2 -14
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/char/watchdog/iop_wdt.c *
@@ -6,19 +7,6 @@* * Based on ixp4xx driver, Copyright 2004 (c) MontaVista, Software, Inc. * -* 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, write to the Free Software Foundation, Inc., 59 Temple -* Place - Suite 330, Boston, MA 02111-1307 USA. -* * Curt E Bruns <[email protected]> * Peter Milne <[email protected]> * Dan Williams <[email protected]>
@@ -258,4 +246,4 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");MODULE_AUTHOR ("Curt E Bruns <[email protected]>" );MODULE_DESCRIPTION ("iop watchdog timer driver" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/it8712f_wdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IT8712F "Smart Guardian" Watchdog support *
@@ -9,15 +10,6 @@* drivers/hwmon/it87.c * IT8712F EC-LPC I/O Preliminary Specification 0.8.2 * IT8712F EC-LPC I/O Preliminary Specification 0.9.3 -* -* 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. -* -* The author(s) of this software shall not be held liable for damages -* of any nature resulting due to the use of this software. This -* software is provided AS-IS with no warranties. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/it87_wdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog Timer Driver * for ITE IT87xx Environment Control - Low Pin Count Input / Output
@@ -16,15 +17,6 @@* IT8702, IT8712, IT8716, IT8718, IT8720, IT8721, IT8726, IT8728, * and IT8783. * -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/ixp4xx_wdt.c +2 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * drivers/char/watchdog/ixp4xx_wdt.c *
@@ -8,9 +9,6 @@* Copyright 2004 (c) MontaVista, Software, Inc. * Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <[email protected]> * -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
@@ -207,4 +205,4 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 60s)");module_param (nowayout, bool,0 );MODULE_PARM_DESC (nowayout,"Watchdog cannot be stopped once started" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/jz4740_wdt.c +1 -9
@@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010, Paul Cercueil <[email protected]> * JZ4740 Watchdog driver * -* 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. -* -* 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 <linux/module.h>
drivers/watchdog/kempld_wdt.c +2 -10
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Kontron PLD watchdog driver * * Copyright (c) 2010-2013 Kontron Europe GmbH * Author: Michael Brunner <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License 2 as published -* by the Free Software Foundation. -* -* 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. -* * Note: From the PLD watchdog point of view timeout and pretimeout are * defined differently than in the kernel. * First the pretimeout stage runs out before the timeout stage gets
@@ -582,4 +574,4 @@ module_platform_driver(kempld_wdt_driver);MODULE_DESCRIPTION ("KEM PLD Watchdog Driver" );MODULE_AUTHOR ("Michael Brunner <[email protected]>" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/ks8695_wdt.c +2 -4
@@ -1,11 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for Kendin/Micrel KS8695. * * (C) 2007 Andrew Victor * -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
@@ -318,5 +316,5 @@ module_exit(ks8695_wdt_exit);MODULE_AUTHOR ("Andrew Victor" );MODULE_DESCRIPTION ("Watchdog driver for KS8695" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:ks8695_wdt" );
drivers/watchdog/lantiq_wdt.c +2 -5
@@ -1,8 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ /* -* 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. -* * Copyright (C) 2010 John Crispin <[email protected]> * Copyright (C) 2017 Hauke Mehrtens <[email protected]> * Based on EP93xx wdt driver
@@ -306,4 +303,4 @@ module_param(nowayout, bool, 0);MODULE_PARM_DESC (nowayout,"Watchdog cannot be stopped once started" );MODULE_AUTHOR ("John Crispin <[email protected]>" );MODULE_DESCRIPTION ("Lantiq SoC Watchdog" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/loongson1_wdt.c +1 -4
@@ -1,10 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2016 Yang Ling <[email protected]> * -* 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. */ #include <linux/clk.h>
drivers/watchdog/lpc18xx_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * NXP LPC18xx Watchdog Timer (WDT) * * Copyright (c) 2015 Ariel D'Alessandro <[email protected]> * -* 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. -* * Notes * ----- * The Watchdog consists of a fixed divide-by-4 clock pre-scaler and a 24-bit
drivers/watchdog/m54xx_wdt.c +2 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * drivers/watchdog/m54xx_wdt.c *
@@ -11,9 +12,6 @@* Copyright 2004 (c) MontaVista, Software, Inc. * Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <[email protected]> * -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
@@ -222,4 +220,4 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 30s)");module_param (nowayout, bool,0 );MODULE_PARM_DESC (nowayout,"Watchdog cannot be stopped once started" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/machzwd.c +1 -10
@@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * MachZ ZF-Logic Watchdog Timer driver for Linux * -* -* 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. -* -* The author does NOT admit liability nor provide warranty for -* any of this software. This material is provided "AS-IS" in -* the hope that it may be useful for others. -* * Author: Fernando Fuganti <[email protected]> * * Based on sbc60xxwdt.c by Jakob Oestergaard
drivers/watchdog/max63xx_wdt.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * drivers/char/watchdog/max63xx_wdt.c *
@@ -5,10 +6,6 @@* * Copyright (C) 2009 Marc Zyngier <[email protected]> * -* 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. -* * This driver assumes the watchdog pins are memory mapped (as it is * the case for the Arcom Zeus). Should it be connected over GPIOs or * another interface, some abstraction will have to be introduced.
drivers/watchdog/max77620_wdt.c +1 -4
@@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Maxim MAX77620 Watchdog Driver * * Copyright (C) 2016 NVIDIA CORPORATION. All rights reserved. * * Author: Laxman Dewangan <[email protected]> -* -* 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 <linux/err.h>
drivers/watchdog/mei_wdt.c +2 -10
@@ -1,15 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Intel Management Engine Interface (Intel MEI) Linux driver * Copyright (c) 2015, Intel 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. */ #include <linux/module.h>
@@ -687,5 +679,5 @@ static struct mei_cl_driver mei_wdt_driver = {module_mei_cl_driver (mei_wdt_driver);MODULE_AUTHOR ("Intel Corporation" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("Device driver for Intel MEI iAMT watchdog" );
drivers/watchdog/mena21_wdt.c +1 -3
@@ -1,11 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for the A21 VME CPU Boards * * Copyright (C) 2013 MEN Mikro Elektronik Nuernberg GmbH * -* 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 */ #include <linux/module.h> #include <linux/moduleparam.h>
drivers/watchdog/menf21bmc_wdt.c +2 -6
@@ -1,12 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * MEN 14F021P00 Board Management Controller (BMC) Watchdog Driver. * * Copyright (C) 2014 MEN Mikro Elektronik Nuernberg GmbH -* -* 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. */ #include <linux/kernel.h>
@@ -199,5 +195,5 @@ module_platform_driver(menf21bmc_wdt);MODULE_DESCRIPTION ("MEN 14F021P00 BMC Watchdog driver" );MODULE_AUTHOR ("Andreas Werner <[email protected]>" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:menf21bmc_wdt" );
drivers/watchdog/meson_gxbb_wdt.c +1 -49
57 lines not on this page · raw message
drivers/watchdog/meson_wdt.c +1 -5
@@ -1,12 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Meson Watchdog Driver * * Copyright (c) 2014 Carlo Caione -* -* 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. */ #include <linux/clk.h>
drivers/watchdog/mixcomwd.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * MixCom Watchdog: A Simple Hardware Watchdog Device * Based on Softdog driver by Alan Cox and PC Watchdog driver by Ken Hollis
@@ -6,11 +7,6 @@* * Copyright (c) 1999 ITConsult-Pro Co. <[email protected]> * -* 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. -* * Version 0.1 (99/04/15): * - first version *
drivers/watchdog/moxart_wdt.c +2 -5
@@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * MOXA ART SoCs watchdog driver. * * Copyright (C) 2013 Jonas Jensen * * Jonas Jensen <[email protected]> -* -* 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 <linux/clk.h>
@@ -174,5 +171,5 @@ module_param(heartbeat, int, 0);MODULE_PARM_DESC (heartbeat,"Watchdog heartbeat in seconds" );MODULE_DESCRIPTION ("MOXART watchdog driver" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_AUTHOR ("Jonas Jensen <[email protected]>" );
drivers/watchdog/mpc8xxx_wdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * mpc8xxx_wdt.c - MPC8xx/MPC83xx/MPC86xx watchdog userspace interface *
@@ -10,11 +11,6 @@* * Note: it appears that you can only actually ENABLE or DISABLE the thing * once after POR. Once enabled, you cannot disable, and vice versa. -* -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/mt7621_wdt.c +1 -4
@@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Ralink MT7621/MT7628 built-in hardware watchdog timer * * Copyright (C) 2014 John Crispin <[email protected]> * * This driver was based on: drivers/watchdog/rt2880_wdt.c -* -* 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 <linux/clk.h>
drivers/watchdog/mtk_wdt.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Mediatek Watchdog Driver *
@@ -5,16 +6,6 @@* * Matthias Brugger <[email protected]> * -* 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. -* * Based on sunxi_wdt.c */
drivers/watchdog/mtx-1_wdt.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Driver for the MTX-1 Watchdog. *
@@ -6,16 +7,6 @@* http://www.4g-systems.biz * * (C) Copyright 2007 OpenWrt.org, Florian Fainelli <[email protected]> -* -* 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. -* -* Neither Michael Stickel nor 4G Systems admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 2005 4G Systems <[email protected]> * * Release 0.01.
drivers/watchdog/mv64x60_wdt.c +2 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * mv64x60_wdt.c - MV64X60 (Marvell Discovery) watchdog userspace interface *
@@ -9,10 +10,7 @@* * Derived from mpc8xx_wdt.c, with the following copyright. * -* 2002 (c) Florian Schirmer <[email protected]> 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. +* 2002 (c) Florian Schirmer <[email protected]> */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/ni903x_wdt.c +1 -10
@@ -1,15 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 National Instruments 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, 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. */ #include <linux/acpi.h>
drivers/watchdog/nic7018_wdt.c +1 -10
@@ -1,15 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 National Instruments 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, 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. */ #include <linux/acpi.h>
drivers/watchdog/nuc900_wdt.c +2 -5
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2009 Nuvoton technology corporation. * * Wan ZongShun <[email protected]> * -* 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. -* */ #include <linux/bitops.h>
@@ -304,5 +301,5 @@ module_platform_driver(nuc900wdt_driver);MODULE_AUTHOR ("Wan ZongShun <[email protected]>" );MODULE_DESCRIPTION ("Watchdog driver for NUC900" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:nuc900-wdt" );
drivers/watchdog/nv_tco.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * nv_tco 0.01: TCO timer driver for NV chipsets *
@@ -8,11 +9,6 @@* Reserved. * http://www.kernelconcepts.de * -* 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. -* * TCO timer driver for NV chipsets * based on softdog.c by Alan Cox <[email protected]> */
drivers/watchdog/nv_tco.h +1 -9
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * nv_tco: TCO timer driver for nVidia chipsets. *
@@ -10,15 +11,6 @@* Reserved. * http://www.kernelconcepts.de * -* 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. -* -* Neither kernel concepts nor Nils Faerber admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 2000 kernel concepts <[email protected]> * developed for * Jentro AG, Haar/Munich (Germany)
drivers/watchdog/octeon-wdt-main.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Octeon Watchdog driver *
@@ -9,16 +10,6 @@* * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * This file is subject to the terms and conditions of the GNU General Public
drivers/watchdog/octeon-wdt-nmi.S +1 -4
@@ -1,8 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* - * 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. - * * Copyright (C) 2007-2017 Cavium, Inc. */ #include <asm/asm.h>
drivers/watchdog/of_xilinx_wdt.c +2 -6
@@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog Device Driver for Xilinx axi/xps_timebase_wdt * * (C) Copyright 2013 - 2014 Xilinx, Inc. * (C) Copyright 2011 (Alejandro Cabrera <[email protected]>) -* -* 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. */ #include <linux/clk.h>
@@ -323,4 +319,4 @@ module_platform_driver(xwdt_driver);MODULE_AUTHOR ("Alejandro Cabrera <[email protected]>" );MODULE_DESCRIPTION ("Xilinx Watchdog driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
drivers/watchdog/omap_wdt.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * omap_wdt.c *
drivers/watchdog/omap_wdt.h +1 -20
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * linux/drivers/char/watchdog/omap_wdt.h *
@@ -5,26 +6,6 @@* OMAP Watchdog timer register definitions * * Copyright (C) 2004 Texas Instruments. -* -* 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -* ANY THEORY OF 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. -* -* 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. */ #ifndef _OMAP_WATCHDOG_H
drivers/watchdog/orion_wdt.c +1 -4
@@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * drivers/watchdog/orion_wdt.c * * Watchdog driver for Orion/Kirkwood processors * * Author: Sylver Bruneau <[email protected]> -* -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/pc87413_wdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * NS pc87413-wdt Watchdog Timer driver for Linux 2.6.x.x *
@@ -6,15 +7,6 @@* (C) Copyright 2006 Sven Anders, <[email protected]> * and Marcus Junker, <[email protected]> * -* 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. -* -* Neither Sven Anders, Marcus Junker nor ANDURAS AG -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. -* * Release 1.1 */
drivers/watchdog/pcwd.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PC Watchdog Driver * by Ken Hollis (khollis at bitgate.com)
drivers/watchdog/pcwd_pci.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Berkshire PCI-PC Watchdog Card Driver *
@@ -9,15 +10,6 @@* Alan Cox <[email protected]>, * Matt Domsch <[email protected]>, * Rob Radez <[email protected]> -* -* 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. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /*
drivers/watchdog/pcwd_usb.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Berkshire USB-PC Watchdog Card Driver *
@@ -10,15 +11,6 @@* Rob Radez <[email protected]>, * Greg Kroah-Hartman <[email protected]> * -* 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. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. -* * Thanks also to Simon Machell at Berkshire Products Inc. for * providing the test hardware. More info is available at * http://www.berkprod.com/ or http://www.pcwatchdog.com/
drivers/watchdog/pic32-dmt.c +1 -4
@@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PIC32 deadman timer driver * * Purna Chandra Mandal <[email protected]> * Copyright (c) 2016, Microchip Technology Inc. * -* 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. */ #include <linux/clk.h> #include <linux/device.h>
drivers/watchdog/pic32-wdt.c +1 -5
@@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PIC32 watchdog driver * * Joshua Henderson <[email protected]> * Copyright (c) 2016, Microchip Technology Inc. -* -* 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. */ #include <linux/clk.h> #include <linux/device.h>
drivers/watchdog/pika_wdt.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PIKA FPGA based Watchdog Timer *
drivers/watchdog/pnx4008_wdt.c +2 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * drivers/char/watchdog/pnx4008_wdt.c *
@@ -11,10 +12,6 @@* 2005-2006 (c) MontaVista Software, Inc. * * (C) 2012 Wolfram Sang, Pengutronix -* -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
@@ -268,5 +265,5 @@ module_param(nowayout, bool, 0);MODULE_PARM_DESC (nowayout,"Set to 1 to keep watchdog running after device release" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:pnx4008-watchdog" );
drivers/watchdog/pnx833x_wdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PNX833x Hardware Watchdog Driver * Copyright 2008 NXP Semiconductors
@@ -9,11 +10,6 @@* * (c) Copyright 2002 Guido Guenther <[email protected]>, 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, or (at your option) any later version. -* * based on softdog.c by Alan Cox <[email protected]> */
drivers/watchdog/pretimeout_noop.c +1 -6
@@ -1,11 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015-2016 Mentor Graphics -* -* 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. -* */ #include <linux/module.h>
drivers/watchdog/pretimeout_panic.c +1 -6
@@ -1,11 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015-2016 Mentor Graphics -* -* 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. -* */ #include <linux/kernel.h>
drivers/watchdog/qcom-wdt.c +3 -11
@@ -1,14 +1,6 @@ -/* Copyright (c) 2014, The Linux Foundation. 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 version 2 and -* only version 2 as published by the Free Software Foundation. -* -* 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. -* +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2014, The Linux Foundation. All rights reserved. */ #include <linux/clk.h> #include <linux/delay.h>
drivers/watchdog/renesas_wdt.c +1 -3
@@ -1,12 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for Renesas WDT watchdog * * Copyright (C) 2015-17 Wolfram Sang, Sang Engineering <[email protected]> * Copyright (C) 2015-17 Renesas Electronics Corporation * -* 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 <linux/bitops.h> #include <linux/clk.h>
drivers/watchdog/retu_wdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Retu watchdog driver *
@@ -5,15 +6,6 @@* * Based on code written by Amit Kucheria and Michael Buesch. * Rewritten by Aaro Koskinen. -* -* 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. -* -* 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. */ #include <linux/slab.h>
drivers/watchdog/riowd.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* riowd.c - driver for hw watchdog inside Super I/O of RIO * * Copyright (C) 2001, 2008 David S. Miller (davem at davemloft.net)
drivers/watchdog/rn5t618_wdt.c +1 -7
@@ -1,14 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for Ricoh RN5T618 PMIC * * Copyright (C) 2014 Beniamino Galvani <[email protected]> -* -* 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. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/device.h>
drivers/watchdog/rt2880_wdt.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Ralink RT288x/RT3xxx/MT76xx built-in hardware watchdog timer *
@@ -5,10 +6,6 @@* Copyright (C) 2013 John Crispin <[email protected]> * * This driver was based on: drivers/watchdog/softdog.c -* -* 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 <linux/clk.h>
drivers/watchdog/rtd119x_wdt.c +1 -1
@@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Realtek RTD129x watchdog * * Copyright (c) 2017 Andreas F?rber * -* SPDX-License-Identifier: GPL-2.0+ */ #include <linux/bitops.h>
drivers/watchdog/rza_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas RZ/A Series WDT Driver * * Copyright (C) 2017 Renesas Electronics America, Inc. * Copyright (C) 2017 Chris Brandt -* -* 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. */ #include <linux/bitops.h>
drivers/watchdog/s3c2410_wdt.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2004 Simtec Electronics * Ben Dooks <[email protected]>
@@ -6,16 +7,6 @@* * Based on, softdog.c by Alan Cox, * (c) Copyright 1996 Alan Cox <[email protected]> -* -* 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. */ #include <linux/module.h>
drivers/watchdog/sa1100_wdt.c +1 -10
@@ -1,18 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for the SA11x0/PXA2xx * * (c) Copyright 2000 Oleg Drokin <[email protected]> * Based on SoftDog driver by Alan Cox <[email protected]> -* -* 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. -* -* Neither Oleg Drokin nor iXcelerator.com admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 2000 Oleg Drokin <[email protected]> * * 27/11/2000 Initial release
drivers/watchdog/sama5d4_wdt.c +1 -2
@@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for Atmel SAMA5D4 Watchdog Timer * * Copyright (C) 2015 Atmel Corporation -* -* Licensed under GPLv2. */ #include <linux/delay.h>
drivers/watchdog/sb_wdog.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0 OR GPL-2.0 /* * Watchdog driver for SiByte SB1 SoCs *
@@ -38,10 +39,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* version 1 or 2 as published by the Free Software Foundation. -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/sbc60xxwdt.c +1 -9
@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * 60xx Single Board Computer Watchdog Timer driver for Linux 2.2.x * * Based on acquirewdt.c by Alan Cox. * -* 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. -* -* The author does NOT admit liability nor provide warranty for -* any of this software. This material is provided "AS-IS" in -* the hope that it may be useful for others. -* * (c) Copyright 2000 Jakob Oestergaard <[email protected]> * * 12/4 - 2000 [Initial revision]
drivers/watchdog/sbc7240_wdt.c +2 -10
@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * NANO7240 SBC Watchdog device driver * * Based on w83877f.c by Scott Jennings, * -* 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; -* -* Software distributed under the License is distributed on an "AS IS" -* basis, WITHOUT WARRANTY OF ANY KIND, either express or -* implied. See the License for the specific language governing -* rights and limitations under the License. -* * (c) Copyright 2007 Gilles GIGAN <[email protected]> * */
@@ -308,4 +300,4 @@ module_exit(sbc7240_wdt_unload);MODULE_AUTHOR ("Gilles Gigan" );MODULE_DESCRIPTION ("Watchdog device driver for single board" " computers EPIC Nano 7240 from iEi" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/sbc8360.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SBC8360 Watchdog driver *
@@ -19,15 +20,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]>
drivers/watchdog/sbc_epx_c3.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SBC EPX C3 0.1 A Hardware Watchdog Device for the Winsystems EPX-C3 * single board computer
@@ -5,11 +6,6 @@* (c) Copyright 2006 Calin A. Culianu <[email protected]>, 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, or (at your option) any later version. -* * based on softdog.c by Alan Cox <[email protected]> */
drivers/watchdog/sbc_fitpc2_wdt.c +2 -5
@@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for SBC-FITPC2 board * * Author: Denis Turischev <[email protected]> * * Adapted from the IXP2000 watchdog driver by Deepak Saxena. -* -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME " WATCHDOG: " fmt
@@ -262,4 +259,4 @@ MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)");module_param (nowayout, bool,0 );MODULE_PARM_DESC (nowayout,"Watchdog cannot be stopped once started" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/sbsa_gwdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SBSA(Server Base System Architecture) Generic Watchdog driver *
@@ -7,15 +8,6 @@* Al Stone <[email protected]> * Timur Tabi <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License 2 as published -* by the Free Software Foundation. -* -* 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. -* * ARM SBSA Generic Watchdog has two stage timeouts: * the first signal (WS0) is for alerting the system by interrupt, * the second one (WS1) is a real hardware reset.
drivers/watchdog/sc1200wdt.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * National Semiconductor PC87307/PC97307 (ala SC1200) WDT driver * (c) Copyright 2002 Zwane Mwaikambo <[email protected]>, * All Rights Reserved. * Based on wdt.c and wdt977.c by Alan Cox and Woody Suwalski respectively. * -* 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. -* -* The author(s) of this software shall not be held liable for damages -* of any nature resulting due to the use of this software. This -* software is provided AS-IS with no warranties. -* * Changelog: * 20020220 Zwane Mwaikambo Code based on datasheet, no hardware. * 20020221 Zwane Mwaikambo Cleanups as suggested by Jeff Garzik
drivers/watchdog/sc520_wdt.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * AMD Elan SC520 processor Watchdog Timer driver * * Based on acquirewdt.c by Alan Cox, * and sbc60xxwdt.c by Jakob Oestergaard <[email protected]> * -* 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. -* -* The authors do NOT admit liability nor provide warranty for -* any of this software. This material is provided "AS-IS" in -* the hope that it may be useful for others. -* * (c) Copyright 2001 Scott Jennings <[email protected]> * 9/27 - 2001 [Initial release] *
drivers/watchdog/sch311x_wdt.c +1 -9
@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * sch311x_wdt.c - Driver for the SCH311x Super-I/O chips * integrated watchdog. * * (c) Copyright 2008 Wim Van Sebroeck <[email protected]>. -* -* 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. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /*
drivers/watchdog/scx200_wdt.c +2 -8
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* drivers/char/watchdog/scx200_wdt.c National Semiconductor SCx200 Watchdog support
@@ -7,15 +8,8 @@Some code taken from: National Semiconductor PC87307/PC97307 (ala SC1200) WDT driver (c) Copyright 2002 Zwane Mwaikambo <[email protected]> +*/ -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. - -The author(s) of this software shall not be held liable for damages -of any nature resulting due to the use of this software. This -software is provided AS-IS with no warranties. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/shwdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/watchdog/shwdt.c *
@@ -5,11 +6,6 @@* * Copyright (C) 2001 - 2012 Paul Mundt <[email protected]> * -* 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. -* * 14-Dec-2001 Matt Domsch <[email protected]> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT *
drivers/watchdog/sirfsoc_wdt.c +2 -3
@@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for CSR SiRFprimaII and SiRFatlasVI * * Copyright (c) 2013 Cambridge Silicon Radio Limited, a CSR plc group company. -* -* Licensed under GPLv2 or later. */ #include <linux/module.h>
@@ -227,5 +226,5 @@ module_platform_driver(sirfsoc_wdt_driver);MODULE_DESCRIPTION ("SiRF SoC watchdog driver" );MODULE_AUTHOR ("Xianglong Du <[email protected]>" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL+" );MODULE_ALIAS ("platform:sirfsoc-wdt" );
drivers/watchdog/smsc37b787_wdt.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x * * Based on acquirewdt.c by Alan Cox <[email protected]> * and some other existing drivers * -* 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. -* -* The authors do NOT admit liability nor provide warranty for -* any of this software. This material is provided "AS-IS" in -* the hope that it may be useful for others. -* * (C) Copyright 2003-2006 Sven Anders <[email protected]> * * History:
drivers/watchdog/softdog.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SoftDog: A Software Watchdog Device * * (c) Copyright 1996 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Software only watchdog driver. Unlike its big brother the WDT501P
drivers/watchdog/sp5100_tco.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * sp5100_tco : TCO timer driver for sp5100 chipsets *
@@ -8,11 +9,6 @@* Reserved. * http://www.kernelconcepts.de * -* 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. -* * See AMD Publication 43009 "AMD SB700/710/750 Register Reference Guide", * AMD Publication 45482 "AMD SB800-Series Southbridges Register * Reference Guide"
drivers/watchdog/sp805_wdt.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/char/watchdog/sp805-wdt.c *
@@ -5,10 +6,6 @@* * Copyright (C) 2010 ST Microelectronics * Viresh Kumar <[email protected]> -* -* This file is licensed under the terms of the GNU General Public -* License version 2 or later. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. */ #include <linux/device.h>
drivers/watchdog/sprd_wdt.c +1 -9
@@ -1,15 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Spreadtrum watchdog driver * Copyright (C) 2017 Spreadtrum - http://www.spreadtrum.com -* -* 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. -* -* 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. */ #include <linux/bitops.h>
drivers/watchdog/st_lpc_wdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * ST's LPC Watchdog *
@@ -5,11 +6,6 @@* * Author: David Paris <[email protected]> for STMicroelectronics * Lee Jones <[email protected]> for STMicroelectronics -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public Licence -* as published by the Free Software Foundation; either version -* 2 of the Licence, or (at your option) any later version. */ #include <linux/clk.h>
drivers/watchdog/stmp3xxx_rtc_wdt.c +1 -4
@@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for the RTC based watchdog in STMP3xxx and i.MX23/28 * * Author: Wolfram Sang <[email protected]> * * Copyright (C) 2011-12 Wolfram Sang, Pengutronix -* -* 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 <linux/kernel.h> #include <linux/module.h>
drivers/watchdog/sun4v_wdt.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * sun4v watchdog timer * (c) Copyright 2016 Oracle Corporation
@@ -5,11 +6,6 @@* Implement a simple watchdog driver using the built-in sun4v hypervisor * watchdog support. If time expires, the hypervisor stops or bounces * the guest domain. -* -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/sunxi_wdt.c +1 -5
@@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * sunxi Watchdog Driver * * Copyright (c) 2013 Carlo Caione * 2012 Henrik Nordstrom * -* 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. -* * Based on xen_wdt.c * (c) Copyright 2010 Novell, Inc. */
drivers/watchdog/tangox_wdt.c +1 -5
@@ -1,11 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Mans Rullgard <[email protected]> * SMP86xx/SMP87xx Watchdog driver -* -* 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. */ #include <linux/bitops.h>
drivers/watchdog/tegra_wdt.c +1 -9
@@ -1,14 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. -* -* 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. */ #include <linux/kernel.h>
drivers/watchdog/ts4800_wdt.c +1 -4
@@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for TS-4800 based boards * * Copyright (c) 2015 - Savoir-faire Linux -* -* 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 <linux/kernel.h>
drivers/watchdog/ts72xx_wdt.c +2 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for Technologic Systems TS-72xx based SBCs * (TS-7200, TS-7250 and TS-7260). These boards have external
@@ -7,10 +8,6 @@* Copyright (c) 2009 Mika Westerberg <[email protected]> * * This driver is based on ep93xx_wdt and wm831x_wdt drivers. -* -* 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 <linux/platform_device.h>
@@ -175,5 +172,5 @@ module_platform_driver(ts72xx_wdt_driver);MODULE_AUTHOR ("Mika Westerberg <[email protected]>" );MODULE_DESCRIPTION ("TS-72xx SBC Watchdog" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:ts72xx-wdt" );
drivers/watchdog/twl4030_wdt.c +1 -14
@@ -1,21 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) Nokia Corporation * * Written by Timo Kokkonen <[email protected]> -* -* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/module.h>
drivers/watchdog/txx9wdt.c +3 -6
@@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* txx9wdt: A Hardware Watchdog Driver for TXx9 SoCs +* txx9wdt: A Hardware Watchdog Driver for TXx9 SoC * * Copyright (C) 2007 Atsushi Nemoto <[email protected]> -* -* 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
@@ -174,5 +171,5 @@ static struct platform_driver txx9wdt_driver = {module_platform_driver_probe (txx9wdt_driver, txx9wdt_probe);MODULE_DESCRIPTION ("TXx9 Watchdog Driver" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:txx9wdt" );
drivers/watchdog/uniphier_wdt.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog driver for the UniPhier watchdog timer * * (c) Copyright 2014 Panasonic Corporation * (c) Copyright 2016 Socionext Inc. * 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 version 2 as -* published by the Free Software Foundation. -* -* 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. */ #include <linux/bitops.h>
drivers/watchdog/ux500_wdt.c +2 -3
@@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) ST-Ericsson SA 2011-2013 * -* License Terms: GNU General Public License v2 -* * Author: Mathieu Poirier <[email protected]> for ST-Ericsson * Author: Jonas Aaberg <[email protected]> for ST-Ericsson */
@@ -165,5 +164,5 @@ module_platform_driver(ux500_wdt_driver);MODULE_AUTHOR ("Jonas Aaberg <[email protected]>" );MODULE_DESCRIPTION ("Ux500 Watchdog Driver" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:ux500_wdt" );
drivers/watchdog/via_wdt.c +2 -2
@@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * VIA Chipset Watchdog Driver * * Copyright (C) 2011 Sigfox -* License terms: GNU General Public License (GPL) version 2 * Author: Marc Vertes <[email protected]> * Based on a preliminary version from Harald Welte <[email protected]> * Timer code by Wim Van Sebroeck <[email protected]>
@@ -258,4 +258,4 @@ module_pci_driver(wdt_driver);MODULE_AUTHOR ("Marc Vertes" );MODULE_DESCRIPTION ("Driver for watchdog timer on VIA chipset" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
drivers/watchdog/w83627hf_wdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * w83627hf/thf WDT driver *
@@ -17,15 +18,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> */
drivers/watchdog/w83877f_wdt.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * W83877F Computer Watchdog Timer driver * * Based on acquirewdt.c by Alan Cox, * and sbc60xxwdt.c by Jakob Oestergaard <[email protected]> * -* 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. -* -* The authors do NOT admit liability nor provide warranty for -* any of this software. This material is provided "AS-IS" in -* the hope that it may be useful for others. -* * (c) Copyright 2001 Scott Jennings <[email protected]> * * 4/19 - 2001 [Initial revision]
drivers/watchdog/w83977f_wdt.c +1 -8
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * W83977F Watchdog Timer Driver for Winbond W83977F I/O Chip *
@@ -5,14 +6,6 @@* * Based on w83877f_wdt.c by Scott Jennings, * and wdt977.c by Woody Suwalski -* -* ----------------------- -* -* 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. -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/wafer5823wdt.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * ICP Wafer 5823 Single Board Computer WDT driver * http://www.icpamerica.com/wafer_5823.php
@@ -12,16 +13,6 @@* * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * */
drivers/watchdog/watchdog_core.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * watchdog_core.c *
@@ -15,15 +16,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* 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. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/watchdog_core.h +1 -9
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * watchdog_core.h *
@@ -15,15 +16,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* 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. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define MAX_DOGS 32/* Maximum number of watchdog devices */
drivers/watchdog/watchdog_dev.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * watchdog_dev.c *
@@ -19,15 +20,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* 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. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/watchdog_pretimeout.c +1 -5
@@ -1,11 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015-2016 Mentor Graphics * -* 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. -* */ #include <linux/list.h>
drivers/watchdog/wd501p.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Industrial Computer Source WDT500/501 driver *
drivers/watchdog/wdat_wdt.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * ACPI Hardware Watchdog (WDAT) driver. * * Copyright (C) 2016, Intel Corporation * Author: Mika Westerberg <[email protected]> -* -* 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 <linux/acpi.h>
drivers/watchdog/wdrtas.c +1 -14
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * FIXME: add wdrtas_get_status and wdrtas_get_boot_status as soon as * RTAS calls are available
@@ -10,20 +11,6 @@* device driver to exploit watchdog RTAS functions * * Authors : Utz Bacher <[email protected]> -* -* 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, 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. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/wdt.c +1 -10
@@ -1,18 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Industrial Computer Source WDT501 driver * * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Release 0.10.
drivers/watchdog/wdt285.c +1 -6
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Intel 21285 watchdog driver * Copyright (c) Phil Blundell <[email protected]>, 1998
@@ -8,12 +9,6 @@* * (c) Copyright 1996 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/wdt977.c +1 -7
@@ -1,16 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Wdt977 0.04: A Watchdog Device for Netwinder W83977AF chip * * (c) Copyright 1998 Rebel.com (Woody Suwalski <[email protected]>) * * ----------------------- -* -* 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. -* -* ----------------------- * 14-Dec-2001 Matt Domsch <[email protected]> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * 19-Dec-2001 Woody Suwalski: Netwinder fixes, ioctl interface
drivers/watchdog/wdt_pci.c +1 -10
@@ -1,18 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Industrial Computer Source PCI-WDT500/501 driver * * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Release 0.10.
drivers/watchdog/wm831x_wdt.c +1 -4
@@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for the wm831x PMICs * * Copyright (C) 2009 Wolfson Microelectronics -* -* 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 */ #include <linux/module.h>
drivers/watchdog/wm8350_wdt.c +1 -4
@@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Watchdog driver for the wm8350 * * Copyright (C) 2007, 2008 Wolfson Microelectronics <[email protected]> -* -* 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 */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/xen_wdt.c +1 -5
@@ -1,12 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Xen Watchdog Driver * * (c) Copyright 2010 Novell, Inc. -* -* 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. */ #define DRV_NAME "xen_wdt"
drivers/watchdog/ziirave_wdt.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Zodiac Inflight Innovations *
@@ -6,16 +7,6 @@* Based on twl4030_wdt.c by Timo Kokkonen <[email protected]>: * * Copyright (C) Nokia 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, 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. */ #include <linux/delay.h>
drivers/watchdog/zx2967_wdt.c +1 -2
@@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * watchdog driver for ZTE's zx2967 family * * Copyright (C) 2017 ZTE Ltd. * * Author: Baoyou Xie <[email protected]> -* -* License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk.h>
Signature · 1 line
2.15.1
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
Quoted 17 lines · Marcus Folkesson
- Add SPDX identifier
- Remove boiler plate license text
- IfMODULE_LICENSEand boiler plate does not match, go for boiler plate licenseSigned-off-by Marcus Folkesson <[email protected]>Acked-by Adam Thomson <[email protected]>Acked-by Charles Keepax <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Michal Simek <[email protected]>---
Notes:
v2:
- Put back removed copyright texts formeson_gxbb_wdtandcoh901327_wdt
- Change to BSD-3-Clause formeson_gxbb_wdt
v1: Please have an extra look atmeson_gxbb_wdt.c
[...]
Quoted 1 line
drivers/watchdog/tangox_wdt.c | 6 +---
For tangox_wdt:
Acked-by Mans Rullgard <[email protected]>
Signature · 1 line
M?ns Rullg?rd
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
In reply to Marcus FolkessonOn Tue, Feb 20, 2018 at 11:45:31AM +0100, Marcus Folkesson wrote:
[...]
Quoted 1 line
drivers/watchdog/tegra_wdt.c | 10 +------
[...]
Acked-by Thierry Reding <[email protected]>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180220/2f28d549/attachment.sig>
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
In reply to Marcus FolkessonQuoted 182 lines · Marcus Folkesson
- Add SPDX identifier
- Remove boiler plate license text
- IfMODULE_LICENSEand boiler plate does not match, go for boiler plate licenseSigned-off-by Marcus Folkesson <[email protected]>Acked-by Adam Thomson <[email protected]>Acked-by Charles Keepax <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Michal Simek <[email protected]>---
Notes:
v2:
- Put back removed copyright texts formeson_gxbb_wdtandcoh901327_wdt
- Change to BSD-3-Clause formeson_gxbb_wdt
v1: Please have an extra look atmeson_gxbb_wdt.cdrivers/watchdog/acquirewdt.c | 6 +--- drivers/watchdog/advantechwdt.c | 6 +--- drivers/watchdog/alim1535_wdt.c | 6 +--- drivers/watchdog/alim7101_wdt.c | 1 + drivers/watchdog/ar7_wdt.c | 14 +--------- drivers/watchdog/asm9260_wdt.c | 2 +- drivers/watchdog/aspeed_wdt.c | 5 +--- drivers/watchdog/at91rm9200_wdt.c | 5 +--- drivers/watchdog/at91sam9_wdt.c | 5 +--- drivers/watchdog/at91sam9_wdt.h | 5 +--- drivers/watchdog/ath79_wdt.c | 4 +-- drivers/watchdog/atlas7_wdt.c | 2 +- drivers/watchdog/bcm2835_wdt.c | 5 +--- drivers/watchdog/bcm47xx_wdt.c | 5 +--- drivers/watchdog/bcm63xx_wdt.c | 5 +--- drivers/watchdog/bcm7038_wdt.c | 12 ++------ drivers/watchdog/bcm_kona_wdt.c | 9 +----- drivers/watchdog/bfin_wdt.c | 2 +- drivers/watchdog/booke_wdt.c | 5 +--- drivers/watchdog/cadence_wdt.c | 5 +--- drivers/watchdog/coh901327_wdt.c | 4 +-- drivers/watchdog/cpu5wdt.c | 15 +--------- drivers/watchdog/cpwd.c | 1 + drivers/watchdog/da9052_wdt.c | 6 +--- drivers/watchdog/da9055_wdt.c | 6 +--- drivers/watchdog/da9062_wdt.c | 10 +------ drivers/watchdog/da9063_wdt.c | 5 +--- drivers/watchdog/davinci_wdt.c | 7 ++--- drivers/watchdog/diag288_wdt.c | 1 + drivers/watchdog/digicolor_wdt.c | 5 +--- drivers/watchdog/dw_wdt.c | 6 +--- drivers/watchdog/ebc-c384_wdt.c | 9 +----- drivers/watchdog/ep93xx_wdt.c | 7 ++--- drivers/watchdog/eurotechwdt.c | 6 +--- drivers/watchdog/f71808e_wdt.c | 16 +---------- drivers/watchdog/ftwdt010_wdt.c | 6 ++-- drivers/watchdog/gef_wdt.c | 6 +--- drivers/watchdog/geodewdt.c | 5 +--- drivers/watchdog/gpio_wdt.c | 5 +--- drivers/watchdog/hpwdt.c | 7 ++--- drivers/watchdog/i6300esb.c | 6 +--- drivers/watchdog/iTCO_vendor_support.c | 9 +----- drivers/watchdog/iTCO_wdt.c | 10 +------ drivers/watchdog/ib700wdt.c | 6 +--- drivers/watchdog/ibmasr.c | 3 +- drivers/watchdog/ie6xx_wdt.c | 18 ++---------- drivers/watchdog/imgpdc_wdt.c | 5 +--- drivers/watchdog/imx2_wdt.c | 5 +--- drivers/watchdog/indydog.c | 6 +--- drivers/watchdog/intel-mid_wdt.c | 6 ++-- drivers/watchdog/intel_scu_watchdog.c | 18 ++---------- drivers/watchdog/intel_scu_watchdog.h | 16 +---------- drivers/watchdog/iop_wdt.c | 16 ++--------- drivers/watchdog/it8712f_wdt.c | 10 +------ drivers/watchdog/it87_wdt.c | 10 +------ drivers/watchdog/ixp4xx_wdt.c | 6 ++-- drivers/watchdog/jz4740_wdt.c | 10 +------ drivers/watchdog/kempld_wdt.c | 12 ++------ drivers/watchdog/ks8695_wdt.c | 6 ++-- drivers/watchdog/lantiq_wdt.c | 7 ++--- drivers/watchdog/loongson1_wdt.c | 5 +--- drivers/watchdog/lpc18xx_wdt.c | 5 +--- drivers/watchdog/m54xx_wdt.c | 6 ++-- drivers/watchdog/machzwd.c | 11 +------- drivers/watchdog/max63xx_wdt.c | 5 +--- drivers/watchdog/max77620_wdt.c | 5 +--- drivers/watchdog/mei_wdt.c | 12 ++------ drivers/watchdog/mena21_wdt.c | 4 +-- drivers/watchdog/menf21bmc_wdt.c | 8 ++---- drivers/watchdog/meson_gxbb_wdt.c | 50 +--------------------------------- drivers/watchdog/meson_wdt.c | 6 +--- drivers/watchdog/mixcomwd.c | 6 +--- drivers/watchdog/moxart_wdt.c | 7 ++--- drivers/watchdog/mpc8xxx_wdt.c | 6 +--- drivers/watchdog/mt7621_wdt.c | 5 +--- drivers/watchdog/mtk_wdt.c | 11 +------- drivers/watchdog/mtx-1_wdt.c | 11 +------- drivers/watchdog/mv64x60_wdt.c | 6 ++-- drivers/watchdog/ni903x_wdt.c | 11 +------- drivers/watchdog/nic7018_wdt.c | 11 +------- drivers/watchdog/nuc900_wdt.c | 7 ++--- drivers/watchdog/nv_tco.c | 6 +--- drivers/watchdog/nv_tco.h | 10 +------ drivers/watchdog/octeon-wdt-main.c | 11 +------- drivers/watchdog/octeon-wdt-nmi.S | 5 +--- drivers/watchdog/of_xilinx_wdt.c | 8 ++---- drivers/watchdog/omap_wdt.c | 1 + drivers/watchdog/omap_wdt.h | 21 +------------- drivers/watchdog/orion_wdt.c | 5 +--- drivers/watchdog/pc87413_wdt.c | 10 +------ drivers/watchdog/pcwd.c | 1 + drivers/watchdog/pcwd_pci.c | 10 +------ drivers/watchdog/pcwd_usb.c | 10 +------ drivers/watchdog/pic32-dmt.c | 5 +--- drivers/watchdog/pic32-wdt.c | 6 +--- drivers/watchdog/pika_wdt.c | 1 + drivers/watchdog/pnx4008_wdt.c | 7 ++--- drivers/watchdog/pnx833x_wdt.c | 6 +--- drivers/watchdog/pretimeout_noop.c | 7 +---- drivers/watchdog/pretimeout_panic.c | 7 +---- drivers/watchdog/qcom-wdt.c | 14 ++-------- drivers/watchdog/renesas_wdt.c | 4 +-- drivers/watchdog/retu_wdt.c | 10 +------ drivers/watchdog/riowd.c | 1 + drivers/watchdog/rn5t618_wdt.c | 8 +----- drivers/watchdog/rt2880_wdt.c | 5 +--- drivers/watchdog/rtd119x_wdt.c | 2 +- drivers/watchdog/rza_wdt.c | 5 +--- drivers/watchdog/s3c2410_wdt.c | 11 +------- drivers/watchdog/sa1100_wdt.c | 11 +------- drivers/watchdog/sama5d4_wdt.c | 3 +- drivers/watchdog/sb_wdog.c | 5 +--- drivers/watchdog/sbc60xxwdt.c | 10 +------ drivers/watchdog/sbc7240_wdt.c | 12 ++------ drivers/watchdog/sbc8360.c | 10 +------ drivers/watchdog/sbc_epx_c3.c | 6 +--- drivers/watchdog/sbc_fitpc2_wdt.c | 7 ++--- drivers/watchdog/sbsa_gwdt.c | 10 +------ drivers/watchdog/sc1200wdt.c | 10 +------ drivers/watchdog/sc520_wdt.c | 10 +------ drivers/watchdog/sch311x_wdt.c | 10 +------ drivers/watchdog/scx200_wdt.c | 10 ++----- drivers/watchdog/shwdt.c | 6 +--- drivers/watchdog/sirfsoc_wdt.c | 5 ++-- drivers/watchdog/smsc37b787_wdt.c | 10 +------ drivers/watchdog/softdog.c | 10 +------ drivers/watchdog/sp5100_tco.c | 6 +--- drivers/watchdog/sp805_wdt.c | 5 +--- drivers/watchdog/sprd_wdt.c | 10 +------ drivers/watchdog/st_lpc_wdt.c | 6 +--- drivers/watchdog/stmp3xxx_rtc_wdt.c | 5 +--- drivers/watchdog/sun4v_wdt.c | 6 +--- drivers/watchdog/sunxi_wdt.c | 6 +--- drivers/watchdog/tangox_wdt.c | 6 +--- drivers/watchdog/tegra_wdt.c | 10 +------ drivers/watchdog/ts4800_wdt.c | 5 +--- drivers/watchdog/ts72xx_wdt.c | 7 ++--- drivers/watchdog/twl4030_wdt.c | 15 +--------- drivers/watchdog/txx9wdt.c | 9 ++---- drivers/watchdog/uniphier_wdt.c | 10 +------ drivers/watchdog/ux500_wdt.c | 5 ++-- drivers/watchdog/via_wdt.c | 4 +-- drivers/watchdog/w83627hf_wdt.c | 10 +------ drivers/watchdog/w83877f_wdt.c | 10 +------ drivers/watchdog/w83977f_wdt.c | 9 +----- drivers/watchdog/wafer5823wdt.c | 11 +------- drivers/watchdog/watchdog_core.c | 10 +------ drivers/watchdog/watchdog_core.h | 10 +------ drivers/watchdog/watchdog_dev.c | 10 +------ drivers/watchdog/watchdog_pretimeout.c | 6 +--- drivers/watchdog/wd501p.h | 1 + drivers/watchdog/wdat_wdt.c | 5 +--- drivers/watchdog/wdrtas.c | 15 +--------- drivers/watchdog/wdt.c | 11 +------- drivers/watchdog/wdt285.c | 7 +---- drivers/watchdog/wdt977.c | 8 +----- drivers/watchdog/wdt_pci.c | 11 +------- drivers/watchdog/wm831x_wdt.c | 5 +--- drivers/watchdog/wm8350_wdt.c | 5 +--- drivers/watchdog/xen_wdt.c | 6 +--- drivers/watchdog/ziirave_wdt.c | 11 +------- drivers/watchdog/zx2967_wdt.c | 3 +- 162 files changed, 195 insertions(+), 1051 deletions(-)
[...]
Quoted 52 lines
drivers/watchdog/meson_gxbb_wdt.c +1
-42@@ -1,56 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* This file is provided under a dual BSD/GPLv2 license. When using or -* redistributing this file, you may do so under either license. -* -* GPL LICENSE SUMMARY -* * Copyright (c) 2016 BayLibre, SAS. * Author: Neil Armstrong <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* 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, see <http://www.gnu.org/licenses/>. -* The full GNU General Public License is included in this distribution -* in the file called COPYING. -* -* BSD LICENSE -* -* Copyright (c) 2016 BayLibre, SAS. -* Author: Neil Armstrong <[email protected]> -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in -* the documentation and/or other materials provided with the -* distribution. -* * Neither the name of Intel Corporation nor the names of its -* contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
drivers/watchdog/meson_gxbb_wdt.c line 8
Quoted 10 lines
drivers/watchdog/meson_gxbb_wdt.c +0
-7-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -* THEORY OF 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. */ #include <linux/clk.h> #include <linux/err.h>
[...]
For meson_gxbb_wdt.c :
Acked-by Neil Armstrong <[email protected]>
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
In reply to Marcus FolkessonQuoted 17 lines · Marcus Folkesson
- Add SPDX identifier
- Remove boiler plate license text
- IfMODULE_LICENSEand boiler plate does not match, go for boiler plate licenseSigned-off-by Marcus Folkesson <[email protected]>Acked-by Adam Thomson <[email protected]>Acked-by Charles Keepax <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Michal Simek <[email protected]>---
Notes:
v2:
- Put back removed copyright texts formeson_gxbb_wdtandcoh901327_wdt
- Change to BSD-3-Clause formeson_gxbb_wdt
v1: Please have an extra look atmeson_gxbb_wdt.c
[...]
Quoted 11 lines
drivers/watchdog/ebc-c384_wdt.c +1
-1@@ -1,15 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog timer driver for the WinSystems EBC-C384 * Copyright (C) 2016 William Breathitt Gray * -* This program is free software; you can redistribute it and/or modify
drivers/watchdog/ebc-c384_wdt.c line 8
Quoted 10 lines
drivers/watchdog/ebc-c384_wdt.c +0
-7-* it under the terms of the GNU General Public License, version 2, as -* published by the Free Software Foundation. -* -* 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. */ #include <linux/device.h> #include <linux/dmi.h>
I have no problem with adding a SPDX line to the top of this file, but use "SPDX-License-Identifier: GPL-2.0-only" as I was very intentional with the selection of GPL version 2 only when I published this code.
Furthermore, please do not remove the existing copyright text; although it's just boilerplate for some, I was careful with the selection of these words, and I worry the SPDX line only -- despite its useful conciseness -- may lead to misunderstandings about my intentioned license for this code.
For the time being, I can't Ack this patch with the changes it makes currently:
William Breathitt Gray
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
Hello William,
Quoted 34 lines · William Breathitt Gray
Quoted 17 lines · Marcus Folkesson
- Add SPDX identifier
- Remove boiler plate license text
- IfMODULE_LICENSEand boiler plate does not match, go for boiler plate licenseSigned-off-by Marcus Folkesson <[email protected]>Acked-by Adam Thomson <[email protected]>Acked-by Charles Keepax <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Michal Simek <[email protected]>---
Notes:
v2:
- Put back removed copyright texts formeson_gxbb_wdtandcoh901327_wdt
- Change to BSD-3-Clause formeson_gxbb_wdt
v1: Please have an extra look atmeson_gxbb_wdt.c[...]
Quoted 13 lines
drivers/watchdog/ebc-c384_wdt.c +1
-3@@ -1,15 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog timer driver for the WinSystems EBC-C384 * Copyright (C) 2016 William Breathitt Gray * -* 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.
Quoted 8 lines
drivers/watchdog/ebc-c384_wdt.c line 8
Quoted 8 lines
drivers/watchdog/ebc-c384_wdt.c +0
-5-* -* 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. */ #include <linux/device.h> #include <linux/dmi.h>
Thank you for your feedback!
Quoted 4 lines
I have no problem with adding a SPDX line to the top of this file, but use "SPDX-License-Identifier: GPL-2.0-only" as I was very intentional with the selection of GPL version 2 only when I published this code.
SPDX-License-Identifier: GPL-2.0
Is GPL-2.0 only [1], so it respects your choice of license.
Quoted 2 lines
Furthermore, please do not remove the existing copyright text; although
The copyright text:
Copyright (C) 2016 William Breathitt Gray
Is still in the file.
Quoted 4 lines
it's just boilerplate for some, I was careful with the selection of these words, and I worry the SPDX line only -- despite its useful conciseness -- may lead to misunderstandings about my intentioned license for this code.
I'm not sure I understand your concerns here, the SPDX identifier is a shorthand for the GPL 2.0 only license. See [1] - Linux kernel licensing rules.
One of the biggest benefits with SPDX identifier is that it is hard to verify boiler plate licenses due to formatting, types, different formulations and so on.
If still worrying, I think we could keep the license text as well.
Quoted 7 lines
For the time being, I can't Ack this patch with the changes it makes currently:
William Breathitt Gray
Please let me know if I got you wrong at some point.
Best regards
Marcus Folkesson
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180220/bcd0dfd8/attachment.sig>
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
Quoted 48 lines · Marcus Folkesson
Hello William,
Quoted 34 lines · William Breathitt Gray
Quoted 17 lines · Marcus Folkesson
- Add SPDX identifier
- Remove boiler plate license text
- IfMODULE_LICENSEand boiler plate does not match, go for boiler plate licenseSigned-off-by Marcus Folkesson <[email protected]>Acked-by Adam Thomson <[email protected]>Acked-by Charles Keepax <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Michal Simek <[email protected]>---
Notes:
v2:
- Put back removed copyright texts formeson_gxbb_wdtandcoh901327_wdt
- Change to BSD-3-Clause formeson_gxbb_wdt
v1: Please have an extra look atmeson_gxbb_wdt.c[...]
Quoted 13 lines
drivers/watchdog/ebc-c384_wdt.c +1
-3@@ -1,15 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog timer driver for the WinSystems EBC-C384 * Copyright (C) 2016 William Breathitt Gray * -* 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. Quoted 8 lines
drivers/watchdog/ebc-c384_wdt.c line 8
Quoted 8 lines
drivers/watchdog/ebc-c384_wdt.c +0
-5-* -* 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. */ #include <linux/device.h> #include <linux/dmi.h> Thank you for your feedback!
Quoted 1 line
Quoted 10 lines
Quoted 3 lines
I have no problem with adding a SPDX line to the top of this file, but use "SPDX-License-Identifier: GPL-2.0-only" as I was very intentional with the selection of GPL version 2 only when I published this code.
SPDX-License-Identifier: GPL-2.0
Is GPL-2.0 only [1], so it respects your choice of license.Quoted 2 lines
Furthermore, please do not remove the existing copyright text; although
It is not a matter if you CAN keep a copyright. You MUST NOT remove a copyright. As long as you do, the series is
Nacked-by Guenter Roeck <[email protected]>
Guenter
Quoted 36 lines
The copyright text:
Copyright (C) 2016 William Breathitt Gray
Is still in the file.
Quoted 4 lines
it's just boilerplate for some, I was careful with the selection of these words, and I worry the SPDX line only -- despite its useful conciseness -- may lead to misunderstandings about my intentioned license for this code.
I'm not sure I understand your concerns here, the SPDX identifier is a shorthand for the GPL 2.0 only license. See [1] - Linux kernel licensing rules.
One of the biggest benefits with SPDX identifier is that it is hard to verify boiler plate licenses due to formatting, types, different formulations and so on.
If still worrying, I think we could keep the license text as well.
Quoted 7 lines
For the time being, I can't Ack this patch with the changes it makes currently:
William Breathitt Gray
Please let me know if I got you wrong at some point.
Best regards
Marcus Folkesson
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
Quoted 25 lines · Guenter Roeck
Quoted 24 lines · Marcus Folkesson
Hello William,
Quoted 21 lines · William Breathitt Gray
Quoted 17 lines · Marcus Folkesson
- Add SPDX identifier
- Remove boiler plate license text
- IfMODULE_LICENSEand boiler plate does not match, go for boiler plate licenseSigned-off-by Marcus Folkesson <[email protected]>Acked-by Adam Thomson <[email protected]>Acked-by Charles Keepax <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Michal Simek <[email protected]>---
Notes:
v2:
- Put back removed copyright texts formeson_gxbb_wdtandcoh901327_wdt
- Change to BSD-3-Clause formeson_gxbb_wdt
v1: Please have an extra look atmeson_gxbb_wdt.c[...]
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/watchdog/ebc-c384_wdt.c line 5
Quoted 10 lines
drivers/watchdog/ebc-c384_wdt.c +1
-0@@ -1,15 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog timer driver for the WinSystems EBC-C384 * Copyright (C) 2016 William Breathitt Gray *
The copyright is untouched?
Quoted 25 lines
Quoted 12 lines
Quoted 11 lines
drivers/watchdog/ebc-c384_wdt.c line 8
Quoted 11 lines
drivers/watchdog/ebc-c384_wdt.c +0
-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. -* -* 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. */ #include <linux/device.h> #include <linux/dmi.h> Quoted 12 lines
Thank you for your feedback!
Quoted 4 lines
I have no problem with adding a SPDX line to the top of this file, but use "SPDX-License-Identifier: GPL-2.0-only" as I was very intentional with the selection of GPL version 2 only when I published this code.
SPDX-License-Identifier: GPL-2.0
Is GPL-2.0 only [1], so it respects your choice of license.Quoted 2 lines
Furthermore, please do not remove the existing copyright text; although
Quoted 6 lines
It is not a matter if you CAN keep a copyright. You MUST NOT remove a copyright. As long as you do, the series is
Nacked-by Guenter Roeck <[email protected]>Guenter
I'm sorry, I do not see where the copyright is removed unless you count the license text as part of the copyright.
Can you please point it out?
Quoted 6 lines
Quoted 6 lines
The copyright text:
Copyright (C) 2016 William Breathitt Gray
Is still in the file.
^^^
Quoted 24 lines
Quoted 24 lines
Quoted 6 lines
it's just boilerplate for some, I was careful with the selection of these words, and I worry the SPDX line only -- despite its useful conciseness -- may lead to misunderstandings about my intentioned license for this code.
I'm not sure I understand your concerns here, the SPDX identifier is a shorthand for the GPL 2.0 only license. See [1] - Linux kernel licensing rules.
One of the biggest benefits with SPDX identifier is that it is hard to verify boiler plate licenses due to formatting, types, different formulations and so on.
If still worrying, I think we could keep the license text as well.
Quoted 7 lines
For the time being, I can't Ack this patch with the changes it makes currently:
William Breathitt Gray
Quoted 8 lines
Quoted 7 lines
Please let me know if I got you wrong at some point.
Best regards
Marcus Folkesson
Best regards
Marcus Folkesson
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180220/e5788c63/attachment.sig>
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
Quoted 26 lines · Marcus Folkesson
Quoted 25 lines · Guenter Roeck
Quoted 24 lines · Marcus Folkesson
Hello William,
Quoted 21 lines · William Breathitt Gray
Quoted 17 lines · Marcus Folkesson
- Add SPDX identifier
- Remove boiler plate license text
- IfMODULE_LICENSEand boiler plate does not match, go for boiler plate licenseSigned-off-by Marcus Folkesson <[email protected]>Acked-by Adam Thomson <[email protected]>Acked-by Charles Keepax <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Michal Simek <[email protected]>---
Notes:
v2:
- Put back removed copyright texts formeson_gxbb_wdtandcoh901327_wdt
- Change to BSD-3-Clause formeson_gxbb_wdt
v1: Please have an extra look atmeson_gxbb_wdt.c[...]
Quoted 33 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/watchdog/ebc-c384_wdt.c line 5
Quoted 10 lines
drivers/watchdog/ebc-c384_wdt.c +1
-0@@ -1,15 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog timer driver for the WinSystems EBC-C384 * Copyright (C) 2016 William Breathitt Gray * The copyright is untouched?
Quoted 20 lines
Quoted 20 lines
Quoted 11 lines
drivers/watchdog/ebc-c384_wdt.c line 8
Quoted 11 lines
drivers/watchdog/ebc-c384_wdt.c +0
-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. -* -* 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. */ #include <linux/device.h> #include <linux/dmi.h> Thank you for your feedback!
Quoted 4 lines
I have no problem with adding a SPDX line to the top of this file, but use "SPDX-License-Identifier: GPL-2.0-only" as I was very intentional with the selection of GPL version 2 only when I published this code.
SPDX-License-Identifier: GPL-2.0
Is GPL-2.0 only [1], so it respects your choice of license.
Ah, this should be fine then. :)
Quoted 18 lines
Quoted 11 lines
Quoted 4 lines
Quoted 3 lines
Furthermore, please do not remove the existing copyright text; although
It is not a matter if you CAN keep a copyright. You MUST NOT remove a copyright. As long as you do, the series is
Nacked-by Guenter Roeck <[email protected]>Guenter
I'm sorry, I do not see where the copyright is removed unless you count the license text as part of the copyright.
Can you please point it out?
Quoted 1 line
Quoted 23 lines
Quoted 5 lines
Quoted 5 lines
The copyright text:
Copyright (C) 2016 William Breathitt Gray
Is still in the file.
^^^
Quoted 15 lines
Quoted 15 lines
Quoted 6 lines
it's just boilerplate for some, I was careful with the selection of these words, and I worry the SPDX line only -- despite its useful conciseness -- may lead to misunderstandings about my intentioned license for this code.
I'm not sure I understand your concerns here, the SPDX identifier is a shorthand for the GPL 2.0 only license. See [1] - Linux kernel licensing rules.
One of the biggest benefits with SPDX identifier is that it is hard to verify boiler plate licenses due to formatting, types, different formulations and so on.
If still worrying, I think we could keep the license text as well.
I'm sorry for the confusion, I should have wrote "license text" rather than "copyright text" in my previous message. I agree with the benefits of utilizing the SPDX identifier, and I see the addition of the SPDX line as useful, but I would prefer the original license text remain as well.
William Breathitt Gray
Quoted 20 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
For the time being, I can't Ack this patch with the changes it makes currently:
William Breathitt Gray
Quoted 8 lines
Quoted 7 lines
Please let me know if I got you wrong at some point.
Best regards
Marcus FolkessonBest regards
Marcus Folkesson
PATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
Quoted 54 lines · William Breathitt Gray
Quoted 53 lines · Marcus Folkesson
Quoted 25 lines · Guenter Roeck
Quoted 24 lines · Marcus Folkesson
Hello William,
Quoted 21 lines · William Breathitt Gray
Quoted 17 lines · Marcus Folkesson
- Add SPDX identifier
- Remove boiler plate license text
- IfMODULE_LICENSEand boiler plate does not match, go for boiler plate licenseSigned-off-by Marcus Folkesson <[email protected]>Acked-by Adam Thomson <[email protected]>Acked-by Charles Keepax <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Michal Simek <[email protected]>---
Notes:
v2:
- Put back removed copyright texts formeson_gxbb_wdtandcoh901327_wdt
- Change to BSD-3-Clause formeson_gxbb_wdt
v1: Please have an extra look atmeson_gxbb_wdt.c[...]
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/watchdog/ebc-c384_wdt.c line 5
Quoted 10 lines
drivers/watchdog/ebc-c384_wdt.c +1
-0@@ -1,15 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Watchdog timer driver for the WinSystems EBC-C384 * Copyright (C) 2016 William Breathitt Gray * The copyright is untouched?
Quoted 14 lines
Quoted 14 lines
Quoted 11 lines
drivers/watchdog/ebc-c384_wdt.c line 8
Quoted 11 lines
drivers/watchdog/ebc-c384_wdt.c +0
-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. -* -* 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. */ #include <linux/device.h> #include <linux/dmi.h> Thank you for your feedback!
Quoted 1 line
Quoted 9 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
I have no problem with adding a SPDX line to the top of this file, but use "SPDX-License-Identifier: GPL-2.0-only" as I was very intentional with the selection of GPL version 2 only when I published this code.
SPDX-License-Identifier: GPL-2.0
Is GPL-2.0 only [1], so it respects your choice of license.Ah, this should be fine then. :)
Good!
Quoted 36 lines
Quoted 36 lines
Quoted 11 lines
Quoted 4 lines
Quoted 3 lines
Furthermore, please do not remove the existing copyright text; although
It is not a matter if you CAN keep a copyright. You MUST NOT remove a copyright. As long as you do, the series is
Nacked-by Guenter Roeck <[email protected]>Guenter
I'm sorry, I do not see where the copyright is removed unless you count the license text as part of the copyright.
Can you please point it out?
Quoted 6 lines
Quoted 6 lines
The copyright text:
Copyright (C) 2016 William Breathitt Gray
Is still in the file.
^^^
Quoted 10 lines
Quoted 10 lines
Quoted 6 lines
it's just boilerplate for some, I was careful with the selection of these words, and I worry the SPDX line only -- despite its useful conciseness -- may lead to misunderstandings about my intentioned license for this code.
I'm not sure I understand your concerns here, the SPDX identifier is a shorthand for the GPL 2.0 only license. See [1] - Linux kernel licensing rules.
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
One of the biggest benefits with SPDX identifier is that it is hard to verify boiler plate licenses due to formatting, types, different formulations and so on.
If still worrying, I think we could keep the license text as well.
I'm sorry for the confusion, I should have wrote "license text" rather than "copyright text" in my previous message. I agree with the benefits
No problem at all.
Quoted 3 lines
of utilizing the SPDX identifier, and I see the addition of the SPDX line as useful, but I would prefer the original license text remain as well.
Of course, I will keep the the original license intact for v3.
Quoted 3 lines
William Breathitt Gray
Best regards
Marcus Folkesson
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180220/07769713/attachment.sig>
Matthias Brugger
maintainerPATCH v2 1/1 watchdog: add SPDX identifiers for watchdog subsystem
In reply to Marcus FolkessonQuoted 19 lines · Marcus Folkesson
- Add SPDX identifier
- Remove boiler plate license text
- IfMODULE_LICENSEand boiler plate does not match, go for boiler plate licenseSigned-off-by Marcus Folkesson <[email protected]>Acked-by Adam Thomson <[email protected]>Acked-by Charles Keepax <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Michal Simek <[email protected]>---
Notes:
v2:
- Put back removed copyright texts formeson_gxbb_wdtandcoh901327_wdt
- Change to BSD-3-Clause formeson_gxbb_wdt
v1: Please have an extra look atmeson_gxbb_wdt.cdrivers/watchdog/acquirewdt.c | 6 +---
[...]
Quoted 5 lines
drivers/watchdog/mpc8xxx_wdt.c | 6 +--- drivers/watchdog/mt7621_wdt.c | 5 +--- drivers/watchdog/mtk_wdt.c | 11 +------- drivers/watchdog/mtx-1_wdt.c | 11 +------- drivers/watchdog/mv64x60_wdt.c | 6 ++--
[...]
Quoted 16 lines
drivers/watchdog/mtk_wdt.c +1
-3@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Mediatek Watchdog Driver * @@ -5,16 +6,6 @@* * Matthias Brugger <[email protected]> * -* 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
drivers/watchdog/mtk_wdt.c line 11
Quoted 10 lines
drivers/watchdog/mtk_wdt.c +0
-7-* (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. -* * Based on sunxi_wdt.c */
Acked-by Matthias Brugger <[email protected]>