* [ASIS-3 patch 0/2] Deep review of 'AS IS' disclaimers - part 3
@ 2019-06-05 13:01 Thomas Gleixner
2019-06-05 13:01 ` [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369 Thomas Gleixner
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Thomas Gleixner @ 2019-06-05 13:01 UTC (permalink / raw)
To: linux-spdx
This is the third variant of disclaimer modifications.
Standard disclaimer:
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
Modified disclaimer:
the file is distributed as is without warranty of any kind and the
implied warranties of merchantability or fitness for a particular
purpose are expressly disclaimed the license provides additional
details about this warranty disclaimer
Both patches refer explicitely to GPLv2.
So as with ASIS-2, I don't see anything contradicting or substantially
different.
In case we agree on that, I would amend the changelogs of the individual
patches with a paragraph explaining our conclusion. Something along the
lines:
The pattern deviates from the standard GPLv2 disclaimer, but the
modifications do not expand beyond the standard disclaimer and the NO
WARRANTY section of the GPLv2. So replacing the license notice
including the modified disclaimer with the SPDX license identifier
results in the same protections and conditions.
Feel free to suggest better wording or deeper explanation.
Thanks,
tglx
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369
2019-06-05 13:01 [ASIS-3 patch 0/2] Deep review of 'AS IS' disclaimers - part 3 Thomas Gleixner
@ 2019-06-05 13:01 ` Thomas Gleixner
2019-06-05 17:01 ` Enrico Weigelt, metux IT consult
2019-06-08 19:30 ` Allison Randal
2019-06-05 13:01 ` [ASIS-3 patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 385 Thomas Gleixner
2019-06-08 19:29 ` [ASIS-3 patch 0/2] Deep review of 'AS IS' disclaimers - part 3 Allison Randal
2 siblings, 2 replies; 9+ messages in thread
From: Thomas Gleixner @ 2019-06-05 13:01 UTC (permalink / raw)
To: linux-spdx
From: Thomas Gleixner tglx@linutronix.de
Based on 1 normalized pattern(s):
this software file the file is distributed by marvell international
ltd under the terms of the gnu general public license version 2 june
1991 the license you may use redistribute and or modify this file in
accordance with the terms and conditions of the license a copy of
which is available by writing to the free software foundation inc 51
franklin street fifth floor boston ma 02110 1301 usa or on the
worldwide web at http www gnu org licenses old licenses gpl 2 0 txt
the file is distributed as is without warranty of any kind and the
implied warranties of merchantability or fitness for a particular
purpose are expressly disclaimed the license provides additional
details about this warranty disclaimer
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-only
has been chosen to replace the boilerplate/reference in 51 file(s).
Bucket: ASIS-3
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
index c4867576be00..c740b1673ddb 100644
--- a/drivers/bluetooth/btmrvl_debugfs.c
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-3&id=f9cab6ebbd20
---
+++ b/drivers/bluetooth/btmrvl_debugfs.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
/**
* Marvell Bluetooth driver: debugfs related functions
*
* Copyright (C) 2009, Marvell International Ltd.
*
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
**/
#include <linux/debugfs.h>
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index fb7729779166..d7df05c56b28 100644
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -1,22 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Bluetooth driver: global definitions & declarations
*
* Copyright (C) 2009, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
- *
*/
#include <linux/kthread.h>
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 708ad21683eb..428b0f394599 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
/**
* Marvell Bluetooth driver
*
* Copyright (C) 2009, Marvell International Ltd.
*
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
**/
#include <linux/module.h>
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 0f3a020703ab..6f330334f9bc 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
/**
* Marvell BT-over-SDIO driver: SDIO interface related functions.
*
* Copyright (C) 2009, Marvell International Ltd.
*
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
**/
#include <linux/firmware.h>
diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
index 3a522d23ee6e..761db1b0c175 100644
--- a/drivers/bluetooth/btmrvl_sdio.h
+++ b/drivers/bluetooth/btmrvl_sdio.h
@@ -1,22 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/**
* Marvell BT-over-SDIO driver: SDIO interface related definitions
*
* Copyright (C) 2009, Marvell International Ltd.
*
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
- *
**/
#define SDIO_HEADER_LEN 4
diff --git a/drivers/net/wireless/marvell/mwifiex/11ac.c b/drivers/net/wireless/marvell/mwifiex/11ac.c
index 59d23fb2365f..a27df15a360d 100644
--- a/drivers/net/wireless/marvell/mwifiex/11ac.c
+++ b/drivers/net/wireless/marvell/mwifiex/11ac.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: 802.11ac
*
* Copyright (C) 2013-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/11ac.h b/drivers/net/wireless/marvell/mwifiex/11ac.h
index 1ca92c7a8a4a..6a1a3dfa6903 100644
--- a/drivers/net/wireless/marvell/mwifiex/11ac.h
+++ b/drivers/net/wireless/marvell/mwifiex/11ac.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: 802.11ac
*
* Copyright (C) 2013-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_11AC_H_
diff --git a/drivers/net/wireless/marvell/mwifiex/11h.c b/drivers/net/wireless/marvell/mwifiex/11h.c
index 238accfe4f41..e7157db69c39 100644
--- a/drivers/net/wireless/marvell/mwifiex/11h.c
+++ b/drivers/net/wireless/marvell/mwifiex/11h.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: 802.11h
*
* Copyright (C) 2013-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "main.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c
index 5d75c971004b..0593242fd730 100644
--- a/drivers/net/wireless/marvell/mwifiex/11n.c
+++ b/drivers/net/wireless/marvell/mwifiex/11n.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: 802.11n
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/11n.h b/drivers/net/wireless/marvell/mwifiex/11n.h
index ea0fa68b9913..8fb904db4fba 100644
--- a/drivers/net/wireless/marvell/mwifiex/11n.h
+++ b/drivers/net/wireless/marvell/mwifiex/11n.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: 802.11n
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_11N_H_
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
index 042a1d07f686..04f79a4799cb 100644
--- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: 802.11n Aggregation
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.h b/drivers/net/wireless/marvell/mwifiex/11n_aggr.h
index 0cd2a3eb6c17..8a434da487b8 100644
--- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.h
+++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: 802.11n Aggregation
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_11N_AGGR_H_
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
index 5380fba652cc..a14137f19ac6 100644
--- a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: 802.11n RX Re-ordering
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h
index 22d991f514c8..2ac54e6c0dda 100644
--- a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h
+++ b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: 802.11n RX Re-ordering
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_11N_RXREORDER_H_
diff --git a/drivers/net/wireless/marvell/mwifiex/Makefile b/drivers/net/wireless/marvell/mwifiex/Makefile
index fdfd9bf15ed4..d5323f323c28 100644
--- a/drivers/net/wireless/marvell/mwifiex/Makefile
+++ b/drivers/net/wireless/marvell/mwifiex/Makefile
@@ -1,18 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
#
# Copyright (C) 2011-2014, Marvell International Ltd.
#
-# This software file (the "File") is distributed by Marvell International
-# Ltd. under the terms of the GNU General Public License Version 2, June 1991
-# (the "License"). You may use, redistribute and/or modify this File in
-# accordance with the terms and conditions of the License, a copy of which
-# is available by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
-# worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
-# ARE EXPRESSLY DISCLAIMED. The License provides additional details about
-# this warranty disclaimer.
mwifiex-y += main.o
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index e11a4bb67172..713c76cb34a0 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: CFG80211
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "cfg80211.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.h b/drivers/net/wireless/marvell/mwifiex/cfg80211.h
index 908367857d58..56382f50e441 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.h
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: CFG80211
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef __MWIFIEX_CFG80211__
diff --git a/drivers/net/wireless/marvell/mwifiex/cfp.c b/drivers/net/wireless/marvell/mwifiex/cfp.c
index f1522fb1c1e8..f03aa0adb4f4 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfp.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfp.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: Channel, Frequence and Power
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index 8c35441fd9b7..bf804dc846f9 100644
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: commands and events
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include <asm/unaligned.h>
diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c
index 8ab114cf3467..ea049425bef6 100644
--- a/drivers/net/wireless/marvell/mwifiex/debugfs.c
+++ b/drivers/net/wireless/marvell/mwifiex/debugfs.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: debugfs
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include <linux/debugfs.h>
diff --git a/drivers/net/wireless/marvell/mwifiex/decl.h b/drivers/net/wireless/marvell/mwifiex/decl.h
index 46696ea0b23e..005be6a19544 100644
--- a/drivers/net/wireless/marvell/mwifiex/decl.h
+++ b/drivers/net/wireless/marvell/mwifiex/decl.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: generic data structures and APIs
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_DECL_H_
diff --git a/drivers/net/wireless/marvell/mwifiex/ethtool.c b/drivers/net/wireless/marvell/mwifiex/ethtool.c
index 58400c69ab26..ca3e9c068734 100644
--- a/drivers/net/wireless/marvell/mwifiex/ethtool.c
+++ b/drivers/net/wireless/marvell/mwifiex/ethtool.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: ethtool
*
* Copyright (C) 2013-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "main.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index b73f99dc5a72..db4708aa50b1 100644
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: Firmware specific macros & structures
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_FW_H_
diff --git a/drivers/net/wireless/marvell/mwifiex/ie.c b/drivers/net/wireless/marvell/mwifiex/ie.c
index 6845eb57b39a..fa6c23305dae 100644
--- a/drivers/net/wireless/marvell/mwifiex/ie.c
+++ b/drivers/net/wireless/marvell/mwifiex/ie.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: management IE handling- setting and
* deleting IE.
*
* Copyright (C) 2012-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "main.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
index 673e89dff0b5..68d6c235e0c4 100644
--- a/drivers/net/wireless/marvell/mwifiex/init.c
+++ b/drivers/net/wireless/marvell/mwifiex/init.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: HW/FW Initialization
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h
index 0dd592ea6e83..0fda624f9e50 100644
--- a/drivers/net/wireless/marvell/mwifiex/ioctl.h
+++ b/drivers/net/wireless/marvell/mwifiex/ioctl.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: ioctl data structures & APIs
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_IOCTL_H_
diff --git a/drivers/net/wireless/marvell/mwifiex/join.c b/drivers/net/wireless/marvell/mwifiex/join.c
index d87aeff70cef..ce376192b2c3 100644
--- a/drivers/net/wireless/marvell/mwifiex/join.c
+++ b/drivers/net/wireless/marvell/mwifiex/join.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: association and ad-hoc start/join
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index f6da8edab7f1..40009484d34d 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: major functions
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include <linux/suspend.h>
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index b025ba164412..a4ccc278febf 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: major data structures and prototypes
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_MAIN_H_
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 3fe81b2a929a..7f418537b395 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: PCIE specific handling
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include <linux/firmware.h>
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
index f7ce9b6db6b4..fc8c43ea4dab 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -1,22 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/* @file mwifiex_pcie.h
*
* @brief This file contains definitions for PCI-E interface.
* driver.
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_PCIE_H
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index 935778ec9a1b..8a5ede334673 100644
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: scan ioctl and command handling
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 24c041dad9f6..dae6af561ac2 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: SDIO specific handling
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include <linux/firmware.h>
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h
index f672bdf52cc1..5da0f218887a 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.h
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: SDIO specific definitions
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_SDIO_H
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 4ed10cf82f9a..415837e6f507 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: station command handling
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index 24b33e20e7a9..48b65f073d6b 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: station command response handling
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c
index 8b3123cb84c8..bde26a83d270 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_event.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: station event handling
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
index ebc0e41e5d3b..12996da107f4 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: functions for station ioctl
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_rx.c b/drivers/net/wireless/marvell/mwifiex/sta_rx.c
index 52a2ce2e78b0..75a94d820a4e 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_rx.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_rx.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: station RX data handling
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include <uapi/linux/ipv6.h>
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_tx.c b/drivers/net/wireless/marvell/mwifiex/sta_tx.c
index 37c24b95e642..abbf5c0f9528 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_tx.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_tx.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: station TX data handling
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/txrx.c b/drivers/net/wireless/marvell/mwifiex/txrx.c
index d848933466d9..597786748bc3 100644
--- a/drivers/net/wireless/marvell/mwifiex/txrx.c
+++ b/drivers/net/wireless/marvell/mwifiex/txrx.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: generic TX/RX data handling
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
index 18f7d9bf30b2..8708b685105a 100644
--- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: AP specific command handling
*
* Copyright (C) 2012-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "main.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c
index 86bfa1b9ef9d..14590755fd57 100644
--- a/drivers/net/wireless/marvell/mwifiex/uap_event.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_event.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: AP event handling
*
* Copyright (C) 2012-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
index 5ce85d5727e4..b77402cfe4ac 100644
--- a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: AP TX and RX data handling
*
* Copyright (C) 2012-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
index d445acc4786b..1b6789577aaf 100644
--- a/drivers/net/wireless/marvell/mwifiex/usb.c
+++ b/drivers/net/wireless/marvell/mwifiex/usb.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: USB specific handling
*
* Copyright (C) 2012-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "main.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/usb.h b/drivers/net/wireless/marvell/mwifiex/usb.h
index 37abd228a84f..705be53ac85e 100644
--- a/drivers/net/wireless/marvell/mwifiex/usb.h
+++ b/drivers/net/wireless/marvell/mwifiex/usb.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* This file contains definitions for mwifiex USB interface driver.
*
* Copyright (C) 2012-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_USB_H
diff --git a/drivers/net/wireless/marvell/mwifiex/util.c b/drivers/net/wireless/marvell/mwifiex/util.c
index f9b71539d33e..a2953c90ba22 100644
--- a/drivers/net/wireless/marvell/mwifiex/util.c
+++ b/drivers/net/wireless/marvell/mwifiex/util.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: utility functions
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/util.h b/drivers/net/wireless/marvell/mwifiex/util.h
index c386992abcdb..b4bd8474a080 100644
--- a/drivers/net/wireless/marvell/mwifiex/util.h
+++ b/drivers/net/wireless/marvell/mwifiex/util.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: utility functions
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_UTIL_H_
diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.c b/drivers/net/wireless/marvell/mwifiex/wmm.c
index 407b9932ca4d..40c6fd2ed5cf 100644
--- a/drivers/net/wireless/marvell/mwifiex/wmm.c
+++ b/drivers/net/wireless/marvell/mwifiex/wmm.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell Wireless LAN device driver: WMM
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "decl.h"
diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.h b/drivers/net/wireless/marvell/mwifiex/wmm.h
index 38f09762bd2f..fb8a3e23ea53 100644
--- a/drivers/net/wireless/marvell/mwifiex/wmm.h
+++ b/drivers/net/wireless/marvell/mwifiex/wmm.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Marvell Wireless LAN device driver: WMM
*
* Copyright (C) 2011-2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available by writing to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _MWIFIEX_WMM_H_
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [ASIS-3 patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 385
2019-06-05 13:01 [ASIS-3 patch 0/2] Deep review of 'AS IS' disclaimers - part 3 Thomas Gleixner
2019-06-05 13:01 ` [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369 Thomas Gleixner
@ 2019-06-05 13:01 ` Thomas Gleixner
2019-06-05 17:04 ` Enrico Weigelt, metux IT consult
2019-06-08 19:31 ` Allison Randal
2019-06-08 19:29 ` [ASIS-3 patch 0/2] Deep review of 'AS IS' disclaimers - part 3 Allison Randal
2 siblings, 2 replies; 9+ messages in thread
From: Thomas Gleixner @ 2019-06-05 13:01 UTC (permalink / raw)
To: linux-spdx
From: Thomas Gleixner tglx@linutronix.de
Based on 1 normalized pattern(s):
this software file the file is distributed by marvell international
ltd under the terms of the gnu general public license version 2 june
1991 the license you may use redistribute and or modify this file in
accordance with the terms and conditions of the license a copy of
which is available on the worldwide web at http www gnu org licenses
old licenses gpl 2 0 txt the file is distributed as is without
warranty of any kind and the implied warranties of merchantability
or fitness for a particular purpose are expressly disclaimed the
license provides additional details about this warranty disclaimer
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-only
has been chosen to replace the boilerplate/reference in 11 file(s).
Bucket: ASIS-3
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/drivers/net/wireless/marvell/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c
index 27779d7317fd..95e5f0df67e3 100644
--- a/drivers/net/wireless/marvell/mwifiex/tdls.c
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-3&id=09de7111ab6b
---
+++ b/drivers/net/wireless/marvell/mwifiex/tdls.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
/* Marvell Wireless LAN device driver: TDLS handling
*
* Copyright (C) 2014, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include "main.h"
diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c
index 52c8ae504e32..05df7ad224d5 100644
--- a/drivers/nfc/nfcmrvl/fw_dnld.c
+++ b/drivers/nfc/nfcmrvl/fw_dnld.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell NFC driver: Firmware downloader
*
* Copyright (C) 2015, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include <linux/module.h>
diff --git a/drivers/nfc/nfcmrvl/fw_dnld.h b/drivers/nfc/nfcmrvl/fw_dnld.h
index ee4a339c05fd..9df36cb4fe50 100644
--- a/drivers/nfc/nfcmrvl/fw_dnld.h
+++ b/drivers/nfc/nfcmrvl/fw_dnld.h
@@ -1,19 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/**
* Marvell NFC driver: Firmware downloader
*
* Copyright (C) 2015, Marvell International Ltd.
*
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
**/
#ifndef __NFCMRVL_FW_DNLD_H__
diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index 0f22379887ca..3570cc6e3857 100644
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -1,19 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
/**
* Marvell NFC-over-I2C driver: I2C interface related functions
*
* Copyright (C) 2015, Marvell International Ltd.
*
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
**/
#include <linux/module.h>
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index e65d027b91fa..cf6b37e7c3b8 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Marvell NFC driver: major functions
*
* Copyright (C) 2014-2015 Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include <linux/module.h>
diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h
index de68ff45e49a..d176d6b98e1d 100644
--- a/drivers/nfc/nfcmrvl/nfcmrvl.h
+++ b/drivers/nfc/nfcmrvl/nfcmrvl.h
@@ -1,19 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/**
* Marvell NFC driver
*
* Copyright (C) 2014-2015, Marvell International Ltd.
*
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
**/
#ifndef _NFCMRVL_H_
diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c
index 8e0ddb434770..1cd8db48ff6a 100644
--- a/drivers/nfc/nfcmrvl/spi.c
+++ b/drivers/nfc/nfcmrvl/spi.c
@@ -1,19 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
/**
* Marvell NFC-over-SPI driver: SPI interface related functions
*
* Copyright (C) 2015, Marvell International Ltd.
*
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
**/
#include <linux/module.h>
diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index 9a22056e8d9e..dfd2aac1c423 100644
--- a/drivers/nfc/nfcmrvl/uart.c
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/**
* Marvell NFC-over-UART driver
*
* Copyright (C) 2015, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#include <linux/module.h>
diff --git a/drivers/nfc/nfcmrvl/usb.c b/drivers/nfc/nfcmrvl/usb.c
index 945cc903d8f1..79b348540a51 100644
--- a/drivers/nfc/nfcmrvl/usb.c
+++ b/drivers/nfc/nfcmrvl/usb.c
@@ -1,19 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
/**
* Marvell NFC-over-USB driver: USB interface related functions
*
* Copyright (C) 2014, Marvell International Ltd.
*
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
**/
#include <linux/module.h>
diff --git a/include/linux/platform_data/nfcmrvl.h b/include/linux/platform_data/nfcmrvl.h
index 9e75ac8d19be..35c699285a3e 100644
--- a/include/linux/platform_data/nfcmrvl.h
+++ b/include/linux/platform_data/nfcmrvl.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2015, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
#ifndef _NFCMRVL_PTF_H_
diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c
index 78fe622eba65..02edef13c371 100644
--- a/net/nfc/nci/uart.c
+++ b/net/nfc/nci/uart.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (C) 2015, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License"). You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
- * this warranty disclaimer.
*/
/* Inspired (hugely) by HCI LDISC implementation in Bluetooth.
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369
2019-06-05 13:01 ` [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369 Thomas Gleixner
@ 2019-06-05 17:01 ` Enrico Weigelt, metux IT consult
2019-06-05 23:01 ` Thomas Gleixner
2019-06-08 19:30 ` Allison Randal
1 sibling, 1 reply; 9+ messages in thread
From: Enrico Weigelt, metux IT consult @ 2019-06-05 17:01 UTC (permalink / raw)
To: Thomas Gleixner, linux-spdx
On 05.06.19 13:01, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
>
> Based on 1 normalized pattern(s):
>
> this software file the file is distributed by marvell international
> ltd under the terms of the gnu general public license version 2 june
> 1991 the license you may use redistribute and or modify this file in
> accordance with the terms and conditions of the license a copy of
> which is available by writing to the free software foundation inc 51
> franklin street fifth floor boston ma 02110 1301 usa or on the
> worldwide web at http www gnu org licenses old licenses gpl 2 0 txt
> the file is distributed as is without warranty of any kind and the
> implied warranties of merchantability or fitness for a particular
> purpose are expressly disclaimed the license provides additional
> details about this warranty disclaimer
>
> extracted by the scancode license scanner the SPDX license identifier
>
> GPL-2.0-only
>
> has been chosen to replace the boilerplate/reference in 51 file(s).
>
> Bucket: ASIS-3
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
>
> diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
> index c4867576be00..c740b1673ddb 100644
> --- a/drivers/bluetooth/btmrvl_debugfs.c
> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-3&id=f9cab6ebbd20
> ---
> +++ b/drivers/bluetooth/btmrvl_debugfs.c
> @@ -1,21 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /**
> * Marvell Bluetooth driver: debugfs related functions
> *
> * Copyright (C) 2009, Marvell International Ltd.
> *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> **/
>
> #include <linux/debugfs.h>
> diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
> index fb7729779166..d7df05c56b28 100644
> --- a/drivers/bluetooth/btmrvl_drv.h
> +++ b/drivers/bluetooth/btmrvl_drv.h
> @@ -1,22 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Bluetooth driver: global definitions & declarations
> *
> * Copyright (C) 2009, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> - *
> */
>
> #include <linux/kthread.h>
> diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
> index 708ad21683eb..428b0f394599 100644
> --- a/drivers/bluetooth/btmrvl_main.c
> +++ b/drivers/bluetooth/btmrvl_main.c
> @@ -1,21 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /**
> * Marvell Bluetooth driver
> *
> * Copyright (C) 2009, Marvell International Ltd.
> *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> **/
>
> #include <linux/module.h>
> diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
> index 0f3a020703ab..6f330334f9bc 100644
> --- a/drivers/bluetooth/btmrvl_sdio.c
> +++ b/drivers/bluetooth/btmrvl_sdio.c
> @@ -1,21 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /**
> * Marvell BT-over-SDIO driver: SDIO interface related functions.
> *
> * Copyright (C) 2009, Marvell International Ltd.
> *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> **/
>
> #include <linux/firmware.h>
> diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
> index 3a522d23ee6e..761db1b0c175 100644
> --- a/drivers/bluetooth/btmrvl_sdio.h
> +++ b/drivers/bluetooth/btmrvl_sdio.h
> @@ -1,22 +1,9 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /**
> * Marvell BT-over-SDIO driver: SDIO interface related definitions
> *
> * Copyright (C) 2009, Marvell International Ltd.
> *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> - *
> **/
>
> #define SDIO_HEADER_LEN 4
> diff --git a/drivers/net/wireless/marvell/mwifiex/11ac.c b/drivers/net/wireless/marvell/mwifiex/11ac.c
> index 59d23fb2365f..a27df15a360d 100644
> --- a/drivers/net/wireless/marvell/mwifiex/11ac.c
> +++ b/drivers/net/wireless/marvell/mwifiex/11ac.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: 802.11ac
> *
> * Copyright (C) 2013-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/11ac.h b/drivers/net/wireless/marvell/mwifiex/11ac.h
> index 1ca92c7a8a4a..6a1a3dfa6903 100644
> --- a/drivers/net/wireless/marvell/mwifiex/11ac.h
> +++ b/drivers/net/wireless/marvell/mwifiex/11ac.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: 802.11ac
> *
> * Copyright (C) 2013-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_11AC_H_
> diff --git a/drivers/net/wireless/marvell/mwifiex/11h.c b/drivers/net/wireless/marvell/mwifiex/11h.c
> index 238accfe4f41..e7157db69c39 100644
> --- a/drivers/net/wireless/marvell/mwifiex/11h.c
> +++ b/drivers/net/wireless/marvell/mwifiex/11h.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: 802.11h
> *
> * Copyright (C) 2013-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "main.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c
> index 5d75c971004b..0593242fd730 100644
> --- a/drivers/net/wireless/marvell/mwifiex/11n.c
> +++ b/drivers/net/wireless/marvell/mwifiex/11n.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: 802.11n
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/11n.h b/drivers/net/wireless/marvell/mwifiex/11n.h
> index ea0fa68b9913..8fb904db4fba 100644
> --- a/drivers/net/wireless/marvell/mwifiex/11n.h
> +++ b/drivers/net/wireless/marvell/mwifiex/11n.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: 802.11n
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_11N_H_
> diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
> index 042a1d07f686..04f79a4799cb 100644
> --- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
> +++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: 802.11n Aggregation
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.h b/drivers/net/wireless/marvell/mwifiex/11n_aggr.h
> index 0cd2a3eb6c17..8a434da487b8 100644
> --- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.h
> +++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: 802.11n Aggregation
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_11N_AGGR_H_
> diff --git a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
> index 5380fba652cc..a14137f19ac6 100644
> --- a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
> +++ b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: 802.11n RX Re-ordering
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h
> index 22d991f514c8..2ac54e6c0dda 100644
> --- a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h
> +++ b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: 802.11n RX Re-ordering
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_11N_RXREORDER_H_
> diff --git a/drivers/net/wireless/marvell/mwifiex/Makefile b/drivers/net/wireless/marvell/mwifiex/Makefile
> index fdfd9bf15ed4..d5323f323c28 100644
> --- a/drivers/net/wireless/marvell/mwifiex/Makefile
> +++ b/drivers/net/wireless/marvell/mwifiex/Makefile
> @@ -1,18 +1,7 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> #
> # Copyright (C) 2011-2014, Marvell International Ltd.
> #
> -# This software file (the "File") is distributed by Marvell International
> -# Ltd. under the terms of the GNU General Public License Version 2, June 1991
> -# (the "License"). You may use, redistribute and/or modify this File in
> -# accordance with the terms and conditions of the License, a copy of which
> -# is available by writing to the Free Software Foundation, Inc.,
> -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> -# worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> -#
> -# THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> -# IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> -# ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> -# this warranty disclaimer.
>
>
> mwifiex-y += main.o
> diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
> index e11a4bb67172..713c76cb34a0 100644
> --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
> +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: CFG80211
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "cfg80211.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.h b/drivers/net/wireless/marvell/mwifiex/cfg80211.h
> index 908367857d58..56382f50e441 100644
> --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.h
> +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: CFG80211
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef __MWIFIEX_CFG80211__
> diff --git a/drivers/net/wireless/marvell/mwifiex/cfp.c b/drivers/net/wireless/marvell/mwifiex/cfp.c
> index f1522fb1c1e8..f03aa0adb4f4 100644
> --- a/drivers/net/wireless/marvell/mwifiex/cfp.c
> +++ b/drivers/net/wireless/marvell/mwifiex/cfp.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: Channel, Frequence and Power
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
> index 8c35441fd9b7..bf804dc846f9 100644
> --- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
> +++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: commands and events
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include <asm/unaligned.h>
> diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c
> index 8ab114cf3467..ea049425bef6 100644
> --- a/drivers/net/wireless/marvell/mwifiex/debugfs.c
> +++ b/drivers/net/wireless/marvell/mwifiex/debugfs.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: debugfs
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include <linux/debugfs.h>
> diff --git a/drivers/net/wireless/marvell/mwifiex/decl.h b/drivers/net/wireless/marvell/mwifiex/decl.h
> index 46696ea0b23e..005be6a19544 100644
> --- a/drivers/net/wireless/marvell/mwifiex/decl.h
> +++ b/drivers/net/wireless/marvell/mwifiex/decl.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: generic data structures and APIs
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_DECL_H_
> diff --git a/drivers/net/wireless/marvell/mwifiex/ethtool.c b/drivers/net/wireless/marvell/mwifiex/ethtool.c
> index 58400c69ab26..ca3e9c068734 100644
> --- a/drivers/net/wireless/marvell/mwifiex/ethtool.c
> +++ b/drivers/net/wireless/marvell/mwifiex/ethtool.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: ethtool
> *
> * Copyright (C) 2013-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "main.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
> index b73f99dc5a72..db4708aa50b1 100644
> --- a/drivers/net/wireless/marvell/mwifiex/fw.h
> +++ b/drivers/net/wireless/marvell/mwifiex/fw.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: Firmware specific macros & structures
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_FW_H_
> diff --git a/drivers/net/wireless/marvell/mwifiex/ie.c b/drivers/net/wireless/marvell/mwifiex/ie.c
> index 6845eb57b39a..fa6c23305dae 100644
> --- a/drivers/net/wireless/marvell/mwifiex/ie.c
> +++ b/drivers/net/wireless/marvell/mwifiex/ie.c
> @@ -1,21 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: management IE handling- setting and
> * deleting IE.
> *
> * Copyright (C) 2012-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "main.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
> index 673e89dff0b5..68d6c235e0c4 100644
> --- a/drivers/net/wireless/marvell/mwifiex/init.c
> +++ b/drivers/net/wireless/marvell/mwifiex/init.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: HW/FW Initialization
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h
> index 0dd592ea6e83..0fda624f9e50 100644
> --- a/drivers/net/wireless/marvell/mwifiex/ioctl.h
> +++ b/drivers/net/wireless/marvell/mwifiex/ioctl.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: ioctl data structures & APIs
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_IOCTL_H_
> diff --git a/drivers/net/wireless/marvell/mwifiex/join.c b/drivers/net/wireless/marvell/mwifiex/join.c
> index d87aeff70cef..ce376192b2c3 100644
> --- a/drivers/net/wireless/marvell/mwifiex/join.c
> +++ b/drivers/net/wireless/marvell/mwifiex/join.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: association and ad-hoc start/join
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
> index f6da8edab7f1..40009484d34d 100644
> --- a/drivers/net/wireless/marvell/mwifiex/main.c
> +++ b/drivers/net/wireless/marvell/mwifiex/main.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: major functions
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include <linux/suspend.h>
> diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
> index b025ba164412..a4ccc278febf 100644
> --- a/drivers/net/wireless/marvell/mwifiex/main.h
> +++ b/drivers/net/wireless/marvell/mwifiex/main.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: major data structures and prototypes
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_MAIN_H_
> diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
> index 3fe81b2a929a..7f418537b395 100644
> --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
> +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: PCIE specific handling
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include <linux/firmware.h>
> diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
> index f7ce9b6db6b4..fc8c43ea4dab 100644
> --- a/drivers/net/wireless/marvell/mwifiex/pcie.h
> +++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
> @@ -1,22 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /* @file mwifiex_pcie.h
> *
> * @brief This file contains definitions for PCI-E interface.
> * driver.
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_PCIE_H
> diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
> index 935778ec9a1b..8a5ede334673 100644
> --- a/drivers/net/wireless/marvell/mwifiex/scan.c
> +++ b/drivers/net/wireless/marvell/mwifiex/scan.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: scan ioctl and command handling
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
> index 24c041dad9f6..dae6af561ac2 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sdio.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: SDIO specific handling
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include <linux/firmware.h>
> diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h
> index f672bdf52cc1..5da0f218887a 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sdio.h
> +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: SDIO specific definitions
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_SDIO_H
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> index 4ed10cf82f9a..415837e6f507 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: station command handling
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
> index 24b33e20e7a9..48b65f073d6b 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: station command response handling
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c
> index 8b3123cb84c8..bde26a83d270 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_event.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: station event handling
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> index ebc0e41e5d3b..12996da107f4 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: functions for station ioctl
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_rx.c b/drivers/net/wireless/marvell/mwifiex/sta_rx.c
> index 52a2ce2e78b0..75a94d820a4e 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_rx.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_rx.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: station RX data handling
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include <uapi/linux/ipv6.h>
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_tx.c b/drivers/net/wireless/marvell/mwifiex/sta_tx.c
> index 37c24b95e642..abbf5c0f9528 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_tx.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_tx.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: station TX data handling
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/txrx.c b/drivers/net/wireless/marvell/mwifiex/txrx.c
> index d848933466d9..597786748bc3 100644
> --- a/drivers/net/wireless/marvell/mwifiex/txrx.c
> +++ b/drivers/net/wireless/marvell/mwifiex/txrx.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: generic TX/RX data handling
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> index 18f7d9bf30b2..8708b685105a 100644
> --- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> +++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: AP specific command handling
> *
> * Copyright (C) 2012-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "main.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c
> index 86bfa1b9ef9d..14590755fd57 100644
> --- a/drivers/net/wireless/marvell/mwifiex/uap_event.c
> +++ b/drivers/net/wireless/marvell/mwifiex/uap_event.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: AP event handling
> *
> * Copyright (C) 2012-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
> index 5ce85d5727e4..b77402cfe4ac 100644
> --- a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
> +++ b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: AP TX and RX data handling
> *
> * Copyright (C) 2012-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
> index d445acc4786b..1b6789577aaf 100644
> --- a/drivers/net/wireless/marvell/mwifiex/usb.c
> +++ b/drivers/net/wireless/marvell/mwifiex/usb.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: USB specific handling
> *
> * Copyright (C) 2012-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "main.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/usb.h b/drivers/net/wireless/marvell/mwifiex/usb.h
> index 37abd228a84f..705be53ac85e 100644
> --- a/drivers/net/wireless/marvell/mwifiex/usb.h
> +++ b/drivers/net/wireless/marvell/mwifiex/usb.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * This file contains definitions for mwifiex USB interface driver.
> *
> * Copyright (C) 2012-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_USB_H
> diff --git a/drivers/net/wireless/marvell/mwifiex/util.c b/drivers/net/wireless/marvell/mwifiex/util.c
> index f9b71539d33e..a2953c90ba22 100644
> --- a/drivers/net/wireless/marvell/mwifiex/util.c
> +++ b/drivers/net/wireless/marvell/mwifiex/util.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: utility functions
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/util.h b/drivers/net/wireless/marvell/mwifiex/util.h
> index c386992abcdb..b4bd8474a080 100644
> --- a/drivers/net/wireless/marvell/mwifiex/util.h
> +++ b/drivers/net/wireless/marvell/mwifiex/util.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: utility functions
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_UTIL_H_
> diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.c b/drivers/net/wireless/marvell/mwifiex/wmm.c
> index 407b9932ca4d..40c6fd2ed5cf 100644
> --- a/drivers/net/wireless/marvell/mwifiex/wmm.c
> +++ b/drivers/net/wireless/marvell/mwifiex/wmm.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell Wireless LAN device driver: WMM
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "decl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.h b/drivers/net/wireless/marvell/mwifiex/wmm.h
> index 38f09762bd2f..fb8a3e23ea53 100644
> --- a/drivers/net/wireless/marvell/mwifiex/wmm.h
> +++ b/drivers/net/wireless/marvell/mwifiex/wmm.h
> @@ -1,20 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Marvell Wireless LAN device driver: WMM
> *
> * Copyright (C) 2011-2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available by writing to the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
> - * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _MWIFIEX_WMM_H_
>
>
Reviewed-By: Enrico Weigelt <info@metux.net>
--
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@metux.net -- +49-151-27565287
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ASIS-3 patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 385
2019-06-05 13:01 ` [ASIS-3 patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 385 Thomas Gleixner
@ 2019-06-05 17:04 ` Enrico Weigelt, metux IT consult
2019-06-08 19:31 ` Allison Randal
1 sibling, 0 replies; 9+ messages in thread
From: Enrico Weigelt, metux IT consult @ 2019-06-05 17:04 UTC (permalink / raw)
To: Thomas Gleixner, linux-spdx
On 05.06.19 13:01, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
>
> Based on 1 normalized pattern(s):
>
> this software file the file is distributed by marvell international
> ltd under the terms of the gnu general public license version 2 june
> 1991 the license you may use redistribute and or modify this file in
> accordance with the terms and conditions of the license a copy of
> which is available on the worldwide web at http www gnu org licenses
> old licenses gpl 2 0 txt the file is distributed as is without
> warranty of any kind and the implied warranties of merchantability
> or fitness for a particular purpose are expressly disclaimed the
> license provides additional details about this warranty disclaimer
>
> extracted by the scancode license scanner the SPDX license identifier
>
> GPL-2.0-only
>
> has been chosen to replace the boilerplate/reference in 11 file(s).
>
> Bucket: ASIS-3
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c
> index 27779d7317fd..95e5f0df67e3 100644
> --- a/drivers/net/wireless/marvell/mwifiex/tdls.c
> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-3&id=09de7111ab6b
> ---
> +++ b/drivers/net/wireless/marvell/mwifiex/tdls.c
> @@ -1,18 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /* Marvell Wireless LAN device driver: TDLS handling
> *
> * Copyright (C) 2014, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include "main.h"
> diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c
> index 52c8ae504e32..05df7ad224d5 100644
> --- a/drivers/nfc/nfcmrvl/fw_dnld.c
> +++ b/drivers/nfc/nfcmrvl/fw_dnld.c
> @@ -1,19 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell NFC driver: Firmware downloader
> *
> * Copyright (C) 2015, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include <linux/module.h>
> diff --git a/drivers/nfc/nfcmrvl/fw_dnld.h b/drivers/nfc/nfcmrvl/fw_dnld.h
> index ee4a339c05fd..9df36cb4fe50 100644
> --- a/drivers/nfc/nfcmrvl/fw_dnld.h
> +++ b/drivers/nfc/nfcmrvl/fw_dnld.h
> @@ -1,19 +1,9 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /**
> * Marvell NFC driver: Firmware downloader
> *
> * Copyright (C) 2015, Marvell International Ltd.
> *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> **/
>
> #ifndef __NFCMRVL_FW_DNLD_H__
> diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
> index 0f22379887ca..3570cc6e3857 100644
> --- a/drivers/nfc/nfcmrvl/i2c.c
> +++ b/drivers/nfc/nfcmrvl/i2c.c
> @@ -1,19 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /**
> * Marvell NFC-over-I2C driver: I2C interface related functions
> *
> * Copyright (C) 2015, Marvell International Ltd.
> *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> **/
>
> #include <linux/module.h>
> diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
> index e65d027b91fa..cf6b37e7c3b8 100644
> --- a/drivers/nfc/nfcmrvl/main.c
> +++ b/drivers/nfc/nfcmrvl/main.c
> @@ -1,19 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Marvell NFC driver: major functions
> *
> * Copyright (C) 2014-2015 Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include <linux/module.h>
> diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h
> index de68ff45e49a..d176d6b98e1d 100644
> --- a/drivers/nfc/nfcmrvl/nfcmrvl.h
> +++ b/drivers/nfc/nfcmrvl/nfcmrvl.h
> @@ -1,19 +1,9 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /**
> * Marvell NFC driver
> *
> * Copyright (C) 2014-2015, Marvell International Ltd.
> *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> **/
>
> #ifndef _NFCMRVL_H_
> diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c
> index 8e0ddb434770..1cd8db48ff6a 100644
> --- a/drivers/nfc/nfcmrvl/spi.c
> +++ b/drivers/nfc/nfcmrvl/spi.c
> @@ -1,19 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /**
> * Marvell NFC-over-SPI driver: SPI interface related functions
> *
> * Copyright (C) 2015, Marvell International Ltd.
> *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> **/
>
> #include <linux/module.h>
> diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
> index 9a22056e8d9e..dfd2aac1c423 100644
> --- a/drivers/nfc/nfcmrvl/uart.c
> +++ b/drivers/nfc/nfcmrvl/uart.c
> @@ -1,19 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /**
> * Marvell NFC-over-UART driver
> *
> * Copyright (C) 2015, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #include <linux/module.h>
> diff --git a/drivers/nfc/nfcmrvl/usb.c b/drivers/nfc/nfcmrvl/usb.c
> index 945cc903d8f1..79b348540a51 100644
> --- a/drivers/nfc/nfcmrvl/usb.c
> +++ b/drivers/nfc/nfcmrvl/usb.c
> @@ -1,19 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /**
> * Marvell NFC-over-USB driver: USB interface related functions
> *
> * Copyright (C) 2014, Marvell International Ltd.
> *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> **/
>
> #include <linux/module.h>
> diff --git a/include/linux/platform_data/nfcmrvl.h b/include/linux/platform_data/nfcmrvl.h
> index 9e75ac8d19be..35c699285a3e 100644
> --- a/include/linux/platform_data/nfcmrvl.h
> +++ b/include/linux/platform_data/nfcmrvl.h
> @@ -1,17 +1,6 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Copyright (C) 2015, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> #ifndef _NFCMRVL_PTF_H_
> diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c
> index 78fe622eba65..02edef13c371 100644
> --- a/net/nfc/nci/uart.c
> +++ b/net/nfc/nci/uart.c
> @@ -1,17 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Copyright (C) 2015, Marvell International Ltd.
> - *
> - * This software file (the "File") is distributed by Marvell International
> - * Ltd. under the terms of the GNU General Public License Version 2, June 1991
> - * (the "License"). You may use, redistribute and/or modify this File in
> - * accordance with the terms and conditions of the License, a copy of which
> - * is available on the worldwide web at
> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> - *
> - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
> - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
> - * this warranty disclaimer.
> */
>
> /* Inspired (hugely) by HCI LDISC implementation in Bluetooth.
>
>
Reviewed-By: Enrico Weigelt <info@metux.net>
--
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@metux.net -- +49-151-27565287
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369
2019-06-05 17:01 ` Enrico Weigelt, metux IT consult
@ 2019-06-05 23:01 ` Thomas Gleixner
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Gleixner @ 2019-06-05 23:01 UTC (permalink / raw)
To: Enrico Weigelt, metux IT consult; +Cc: linux-spdx
Enrico,
On Wed, 5 Jun 2019, Enrico Weigelt, metux IT consult wrote:
I surely appreciate your participation, but can you please trim your
replies, so they still have enough context, e.g.
> On 05.06.19 13:01, Thomas Gleixner wrote:
> > From: Thomas Gleixner tglx@linutronix.de
> >
> > Based on 1 normalized pattern(s):
> >
> > this software file the file is distributed by marvell international
> > ltd under the terms of the gnu general public license version 2 june
> > 1991 the license you may use redistribute and or modify this file in
> > accordance with the terms and conditions of the license a copy of
> > which is available by writing to the free software foundation inc 51
> > franklin street fifth floor boston ma 02110 1301 usa or on the
> > worldwide web at http www gnu org licenses old licenses gpl 2 0 txt
> > the file is distributed as is without warranty of any kind and the
> > implied warranties of merchantability or fitness for a particular
> > purpose are expressly disclaimed the license provides additional
> > details about this warranty disclaimer
> >
> > extracted by the scancode license scanner the SPDX license identifier
> >
> > GPL-2.0-only
> >
> > has been chosen to replace the boilerplate/reference in 51 file(s).
> >
> > Bucket: ASIS-3
> >
> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
but do not require the recipients to scroll down 1500 lines of quoted text
to find the meat of your reply, i.e. the single line you added:
> Reviewed-By: Enrico Weigelt <info@metux.net>
Tools don't care, but humans who actually read mail care a lot. All the
context is archived and every subscriber has it at his fingertips if
necessary.
Thanks,
tglx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ASIS-3 patch 0/2] Deep review of 'AS IS' disclaimers - part 3
2019-06-05 13:01 [ASIS-3 patch 0/2] Deep review of 'AS IS' disclaimers - part 3 Thomas Gleixner
2019-06-05 13:01 ` [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369 Thomas Gleixner
2019-06-05 13:01 ` [ASIS-3 patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 385 Thomas Gleixner
@ 2019-06-08 19:29 ` Allison Randal
2 siblings, 0 replies; 9+ messages in thread
From: Allison Randal @ 2019-06-08 19:29 UTC (permalink / raw)
To: linux-spdx
On 6/5/19 9:01 AM, Thomas Gleixner wrote:
> This is the third variant of disclaimer modifications.
>
> Standard disclaimer:
>
> 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
>
> Modified disclaimer:
>
> the file is distributed as is without warranty of any kind and the
> implied warranties of merchantability or fitness for a particular
> purpose are expressly disclaimed the license provides additional
> details about this warranty disclaimer
>
> Both patches refer explicitely to GPLv2.
>
> So as with ASIS-2, I don't see anything contradicting or substantially
> different.
The wording "as is" is directly copied from GPLv2, so adds no additional
disclaimer.
My understanding is that "expressly disclaimed" means the same thing as
disclaiming a specific warranty by name, so this variant doesn't
actually legally do anything different than the standard disclaimer
notice, since the implied warranties of merchantability and fitness for
a particular purpose were already disclaimed by name. Again, I'll review
positively, but suggest waiting for at least one lawyer to review.
Allison
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369
2019-06-05 13:01 ` [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369 Thomas Gleixner
2019-06-05 17:01 ` Enrico Weigelt, metux IT consult
@ 2019-06-08 19:30 ` Allison Randal
1 sibling, 0 replies; 9+ messages in thread
From: Allison Randal @ 2019-06-08 19:30 UTC (permalink / raw)
To: linux-spdx
On 6/5/19 9:01 AM, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
>
> Based on 1 normalized pattern(s):
>
> this software file the file is distributed by marvell international
> ltd under the terms of the gnu general public license version 2 june
> 1991 the license you may use redistribute and or modify this file in
> accordance with the terms and conditions of the license a copy of
> which is available by writing to the free software foundation inc 51
> franklin street fifth floor boston ma 02110 1301 usa or on the
> worldwide web at http www gnu org licenses old licenses gpl 2 0 txt
> the file is distributed as is without warranty of any kind and the
> implied warranties of merchantability or fitness for a particular
> purpose are expressly disclaimed the license provides additional
> details about this warranty disclaimer
>
> extracted by the scancode license scanner the SPDX license identifier
>
> GPL-2.0-only
>
> has been chosen to replace the boilerplate/reference in 51 file(s).
>
> Bucket: ASIS-3
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Allison Randal <allison@lohutok.net>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ASIS-3 patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 385
2019-06-05 13:01 ` [ASIS-3 patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 385 Thomas Gleixner
2019-06-05 17:04 ` Enrico Weigelt, metux IT consult
@ 2019-06-08 19:31 ` Allison Randal
1 sibling, 0 replies; 9+ messages in thread
From: Allison Randal @ 2019-06-08 19:31 UTC (permalink / raw)
To: linux-spdx
On 6/5/19 9:01 AM, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
>
> Based on 1 normalized pattern(s):
>
> this software file the file is distributed by marvell international
> ltd under the terms of the gnu general public license version 2 june
> 1991 the license you may use redistribute and or modify this file in
> accordance with the terms and conditions of the license a copy of
> which is available on the worldwide web at http www gnu org licenses
> old licenses gpl 2 0 txt the file is distributed as is without
> warranty of any kind and the implied warranties of merchantability
> or fitness for a particular purpose are expressly disclaimed the
> license provides additional details about this warranty disclaimer
>
> extracted by the scancode license scanner the SPDX license identifier
>
> GPL-2.0-only
>
> has been chosen to replace the boilerplate/reference in 11 file(s).
>
> Bucket: ASIS-3
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Allison Randal <allison@lohutok.net>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-06-08 19:31 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-05 13:01 [ASIS-3 patch 0/2] Deep review of 'AS IS' disclaimers - part 3 Thomas Gleixner
2019-06-05 13:01 ` [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369 Thomas Gleixner
2019-06-05 17:01 ` Enrico Weigelt, metux IT consult
2019-06-05 23:01 ` Thomas Gleixner
2019-06-08 19:30 ` Allison Randal
2019-06-05 13:01 ` [ASIS-3 patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 385 Thomas Gleixner
2019-06-05 17:04 ` Enrico Weigelt, metux IT consult
2019-06-08 19:31 ` Allison Randal
2019-06-08 19:29 ` [ASIS-3 patch 0/2] Deep review of 'AS IS' disclaimers - part 3 Allison Randal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).