Re: [PATCH 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier

From: Guenter Roeck
Date: Thu May 11 2023 - 11:08:16 EST

Next message: Christian Göttsche: "[RFC PATCH v2] fs/xattr: add *at family syscalls"
Previous message: Martin Povišer: "[PATCH v2 2/2] ASoC: ssm3515: Add new amp driver"
In reply to: Simon Horman: "Re: [PATCH 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier"
Next in thread: Bagas Sanjaya: "Re: [PATCH 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Thu, May 11, 2023 at 08:34:04PM +0700, Bagas Sanjaya wrote:
> Many watchdog drivers's source files has already SPDX license
> identifier, while some remaining doesn't.
>
> Convert notices on remaining files to SPDX identifier.
>
> Cc: Ray Lehtiniemi <rayl@xxxxxxxx>
> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
> Cc: Andrey Panin <pazke@xxxxxxxxx>
> Cc: Oleg Drokin <green@xxxxxxxxxx>
> Cc: Marc Zyngier <maz@xxxxxxxxxx>
> Cc: Jonas Jensen <jonas.jensen@xxxxxxxxx>
> Cc: Sylver Bruneau <sylver.bruneau@xxxxxxxxxxxxxx>
> Cc: Andrew Sharp <andy.sharp@xxxxxxx>
> Cc: Denis Turischev <denis@xxxxxxxxxxxxxx>
> Cc: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> Signed-off-by: Bagas Sanjaya <bagasdotme@xxxxxxxxx>
> ---
> drivers/watchdog/ep93xx_wdt.c | 5 +----
> drivers/watchdog/ibmasr.c | 3 +--
> drivers/watchdog/m54xx_wdt.c | 4 +---
> drivers/watchdog/max63xx_wdt.c | 5 +----
> drivers/watchdog/moxart_wdt.c | 4 +---
> drivers/watchdog/octeon-wdt-nmi.S | 5 +----
> drivers/watchdog/orion_wdt.c | 4 +---
> drivers/watchdog/rtd119x_wdt.c | 2 +-
> drivers/watchdog/sb_wdog.c | 5 +----
> drivers/watchdog/sbc_fitpc2_wdt.c | 4 +---
> drivers/watchdog/ts4800_wdt.c | 4 +---
> drivers/watchdog/ts72xx_wdt.c | 4 +---
> 12 files changed, 12 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
> index 38e26f160b9a57..f5d70842617fe9 100644
> --- a/drivers/watchdog/ep93xx_wdt.c
> +++ b/drivers/watchdog/ep93xx_wdt.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */

This was supposed to be a C++ style comment for C source files.
Has the rule changed ?

> /*
> * Watchdog driver for Cirrus Logic EP93xx family of devices.
> *
> @@ -11,10 +12,6 @@
> * Copyright (c) 2012 H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
> * 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
> diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
> index 4a22fe15208630..df03f3b2659a3e 100644
> --- a/drivers/watchdog/ibmasr.c
> +++ b/drivers/watchdog/ibmasr.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-1.0-or-later */
> /*
> * 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
> diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c
> index f388a769dbd33d..9ca80b6c1790b6 100644
> --- a/drivers/watchdog/m54xx_wdt.c
> +++ b/drivers/watchdog/m54xx_wdt.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * drivers/watchdog/m54xx_wdt.c
> *
> @@ -11,9 +12,6 @@
> * Copyright 2004 (c) MontaVista, Software, Inc.
> * Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <green@xxxxxxxxxx>
> *
> - * 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
> diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
> index 9e1541cfae0d89..811f6dabad2c08 100644
> --- a/drivers/watchdog/max63xx_wdt.c
> +++ b/drivers/watchdog/max63xx_wdt.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * drivers/char/watchdog/max63xx_wdt.c
> *
> @@ -5,10 +6,6 @@
> *
> * Copyright (C) 2009 Marc Zyngier <maz@xxxxxxxxxxxxxxx>
> *
> - * 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.
> diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c
> index 6340a1f5f471b2..c87873c7d13f86 100644
> --- a/drivers/watchdog/moxart_wdt.c
> +++ b/drivers/watchdog/moxart_wdt.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * MOXA ART SoCs watchdog driver.
> *
> @@ -5,9 +6,6 @@
> *
> * Jonas Jensen <jonas.jensen@xxxxxxxxx>
> *
> - * 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>
> diff --git a/drivers/watchdog/octeon-wdt-nmi.S b/drivers/watchdog/octeon-wdt-nmi.S
> index 97f6eb7b5a8e04..e308cc74392018 100644
> --- a/drivers/watchdog/octeon-wdt-nmi.S
> +++ b/drivers/watchdog/octeon-wdt-nmi.S
> @@ -1,8 +1,5 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */

The text below suggests that this should be GPL1+.

> /*
> - * 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>
> diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
> index 5ec2dd8fd5fa3d..938b357a12b911 100644
> --- a/drivers/watchdog/orion_wdt.c
> +++ b/drivers/watchdog/orion_wdt.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * drivers/watchdog/orion_wdt.c
> *
> @@ -5,9 +6,6 @@
> *
> * Author: Sylver Bruneau <sylver.bruneau@xxxxxxxxxxxxxx>
> *
> - * 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
> diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c
> index 95c8d7abce42e6..1c3c36e9779739 100644
> --- a/drivers/watchdog/rtd119x_wdt.c
> +++ b/drivers/watchdog/rtd119x_wdt.c
> @@ -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>
> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
> index 504be461f992a9..00b35eddf9395f 100644
> --- a/drivers/watchdog/sb_wdog.c
> +++ b/drivers/watchdog/sb_wdog.c
> @@ -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 <alan@xxxxxxxxxxxxxxxxxxx>,
> * 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
> diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c
> index 13db71e165836e..141fcbd11c4c82 100644
> --- a/drivers/watchdog/sbc_fitpc2_wdt.c
> +++ b/drivers/watchdog/sbc_fitpc2_wdt.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Watchdog driver for SBC-FITPC2 board
> *
> @@ -5,9 +6,6 @@
> *
> * 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
> diff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c
> index 0ea554c7cda579..9d7d7ad876a788 100644
> --- a/drivers/watchdog/ts4800_wdt.c
> +++ b/drivers/watchdog/ts4800_wdt.c
> @@ -1,11 +1,9 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * 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>
> diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
> index bf918f5fa13175..bb53dc481006c9 100644
> --- a/drivers/watchdog/ts72xx_wdt.c
> +++ b/drivers/watchdog/ts72xx_wdt.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Watchdog driver for Technologic Systems TS-72xx based SBCs
> * (TS-7200, TS-7250 and TS-7260). These boards have external
> @@ -8,9 +9,6 @@
> *
> * 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>
> --
> An old man doll... just what I always wanted! - Clara
>

Next message: Christian Göttsche: "[RFC PATCH v2] fs/xattr: add *at family syscalls"
Previous message: Martin Povišer: "[PATCH v2 2/2] ASoC: ssm3515: Add new amp driver"
In reply to: Simon Horman: "Re: [PATCH 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier"
Next in thread: Bagas Sanjaya: "Re: [PATCH 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]