Re: [ASIS-3 patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 369

["Enrico Weigelt, metux IT consult" <lkml@xxxxxxxxx>]

On 05.06.19 13:01, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@xxxxxxxxxxxxx
>
> 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@xxxxxxxxxxxxx>
>
> 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@xxxxxxxxx>

--
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@xxxxxxxxx -- +49-151-27565287