diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-06-04 04:11:33 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-19 11:09:55 -0400 |
commit | d2912cb15bdda8ba4a5dd73396ad62641af2f520 (patch) | |
tree | ff723089c8673e3f99df3ddcdaeae7a52bd6fdac /drivers/memstick | |
parent | 20c8ccb1975b8d5639789d1025ad6ada38bd6f48 (diff) |
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
Based on 2 normalized pattern(s):
this program is free software you can redistribute it and or modify
it under the terms of the gnu general public license version 2 as
published by the free software foundation
this program is free software you can redistribute it and or modify
it under the terms of the gnu general public license version 2 as
published by the free software foundation #
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-only
has been chosen to replace the boilerplate/reference in 4122 file(s).
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Enrico Weigelt <info@metux.net>
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Allison Randal <allison@lohutok.net>
Cc: linux-spdx@vger.kernel.org
Link: https://lkml.kernel.org/r/20190604081206.933168790@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/memstick')
-rw-r--r-- | drivers/memstick/core/memstick.c | 6 | ||||
-rw-r--r-- | drivers/memstick/core/ms_block.c | 6 | ||||
-rw-r--r-- | drivers/memstick/core/ms_block.h | 6 | ||||
-rw-r--r-- | drivers/memstick/core/mspro_block.c | 6 | ||||
-rw-r--r-- | drivers/memstick/host/jmb38x_ms.c | 6 | ||||
-rw-r--r-- | drivers/memstick/host/r592.c | 5 | ||||
-rw-r--r-- | drivers/memstick/host/r592.h | 5 | ||||
-rw-r--r-- | drivers/memstick/host/tifm_ms.c | 6 |
8 files changed, 8 insertions, 38 deletions
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index 1246d69ba187..6cfb293396f2 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c | |||
@@ -1,15 +1,11 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Sony MemoryStick support | 3 | * Sony MemoryStick support |
3 | * | 4 | * |
4 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> | 5 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> |
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * Special thanks to Carlos Corbacho for providing various MemoryStick cards | 7 | * Special thanks to Carlos Corbacho for providing various MemoryStick cards |
11 | * that made this driver possible. | 8 | * that made this driver possible. |
12 | * | ||
13 | */ | 9 | */ |
14 | 10 | ||
15 | #include <linux/memstick.h> | 11 | #include <linux/memstick.h> |
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index 82daccc9ea62..384927ebde74 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c | |||
@@ -1,15 +1,11 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * ms_block.c - Sony MemoryStick (legacy) storage support | 3 | * ms_block.c - Sony MemoryStick (legacy) storage support |
3 | 4 | ||
4 | * Copyright (C) 2013 Maxim Levitsky <maximlevitsky@gmail.com> | 5 | * Copyright (C) 2013 Maxim Levitsky <maximlevitsky@gmail.com> |
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * Minor portions of the driver were copied from mspro_block.c which is | 7 | * Minor portions of the driver were copied from mspro_block.c which is |
11 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> | 8 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> |
12 | * | ||
13 | */ | 9 | */ |
14 | #define DRIVER_NAME "ms_block" | 10 | #define DRIVER_NAME "ms_block" |
15 | #define pr_fmt(fmt) DRIVER_NAME ": " fmt | 11 | #define pr_fmt(fmt) DRIVER_NAME ": " fmt |
diff --git a/drivers/memstick/core/ms_block.h b/drivers/memstick/core/ms_block.h index 9ba84e0ced63..122e1a8a8bd5 100644 --- a/drivers/memstick/core/ms_block.h +++ b/drivers/memstick/core/ms_block.h | |||
@@ -1,18 +1,14 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
1 | /* | 2 | /* |
2 | * ms_block.h - Sony MemoryStick (legacy) storage support | 3 | * ms_block.h - Sony MemoryStick (legacy) storage support |
3 | 4 | ||
4 | * Copyright (C) 2013 Maxim Levitsky <maximlevitsky@gmail.com> | 5 | * Copyright (C) 2013 Maxim Levitsky <maximlevitsky@gmail.com> |
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * Minor portions of the driver are copied from mspro_block.c which is | 7 | * Minor portions of the driver are copied from mspro_block.c which is |
11 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> | 8 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> |
12 | * | 9 | * |
13 | * Also ms structures were copied from old broken driver by same author | 10 | * Also ms structures were copied from old broken driver by same author |
14 | * These probably come from MS spec | 11 | * These probably come from MS spec |
15 | * | ||
16 | */ | 12 | */ |
17 | 13 | ||
18 | #ifndef MS_BLOCK_NEW_H | 14 | #ifndef MS_BLOCK_NEW_H |
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index 9545e87b6085..cd6b8d4f2335 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c | |||
@@ -1,15 +1,11 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Sony MemoryStick Pro storage support | 3 | * Sony MemoryStick Pro storage support |
3 | * | 4 | * |
4 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> | 5 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> |
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * Special thanks to Carlos Corbacho for providing various MemoryStick cards | 7 | * Special thanks to Carlos Corbacho for providing various MemoryStick cards |
11 | * that made this driver possible. | 8 | * that made this driver possible. |
12 | * | ||
13 | */ | 9 | */ |
14 | 10 | ||
15 | #include <linux/blk-mq.h> | 11 | #include <linux/blk-mq.h> |
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index 5733e8fe1aef..32747425297d 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c | |||
@@ -1,12 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * jmb38x_ms.c - JMicron jmb38x MemoryStick card reader | 3 | * jmb38x_ms.c - JMicron jmb38x MemoryStick card reader |
3 | * | 4 | * |
4 | * Copyright (C) 2008 Alex Dubov <oakad@yahoo.com> | 5 | * Copyright (C) 2008 Alex Dubov <oakad@yahoo.com> |
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | */ | 6 | */ |
11 | 7 | ||
12 | #include <linux/spinlock.h> | 8 | #include <linux/spinlock.h> |
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c index 627d6e62fe31..2932f421b3ea 100644 --- a/drivers/memstick/host/r592.c +++ b/drivers/memstick/host/r592.c | |||
@@ -1,10 +1,7 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2010 - Maxim Levitsky | 3 | * Copyright (C) 2010 - Maxim Levitsky |
3 | * driver for Ricoh memstick readers | 4 | * driver for Ricoh memstick readers |
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License version 2 as | ||
7 | * published by the Free Software Foundation. | ||
8 | */ | 5 | */ |
9 | 6 | ||
10 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
diff --git a/drivers/memstick/host/r592.h b/drivers/memstick/host/r592.h index c5726c1e8832..c161db70c8f5 100644 --- a/drivers/memstick/host/r592.h +++ b/drivers/memstick/host/r592.h | |||
@@ -1,10 +1,7 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
1 | /* | 2 | /* |
2 | * Copyright (C) 2010 - Maxim Levitsky | 3 | * Copyright (C) 2010 - Maxim Levitsky |
3 | * driver for Ricoh memstick readers | 4 | * driver for Ricoh memstick readers |
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License version 2 as | ||
7 | * published by the Free Software Foundation. | ||
8 | */ | 5 | */ |
9 | 6 | ||
10 | #ifndef R592_H | 7 | #ifndef R592_H |
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c index 6b13ac56eb27..5b966b54d6e9 100644 --- a/drivers/memstick/host/tifm_ms.c +++ b/drivers/memstick/host/tifm_ms.c | |||
@@ -1,15 +1,11 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * TI FlashMedia driver | 3 | * TI FlashMedia driver |
3 | * | 4 | * |
4 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> | 5 | * Copyright (C) 2007 Alex Dubov <oakad@yahoo.com> |
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * Special thanks to Carlos Corbacho for providing various MemoryStick cards | 7 | * Special thanks to Carlos Corbacho for providing various MemoryStick cards |
11 | * that made this driver possible. | 8 | * that made this driver possible. |
12 | * | ||
13 | */ | 9 | */ |
14 | 10 | ||
15 | #include <linux/tifm.h> | 11 | #include <linux/tifm.h> |