iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: rc: add SPDX identifiers to the code I wrote

Browse Source 
As we're now using SPDX identifiers, on the several
media drivers I wrote, add the proper SPDX, identifying
the license I meant.

As we're now using the short license, it doesn't make sense to
keep the original license text.

Also, fix MODULE_LICENSE to properly identify GPL v2.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2017-12-01 08:47:08 -05:00
parent 0393e73564
commit 20835280ce
6 changed files with 38 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/rc/ir-nec-decoder.c
View File

@ -1,16 +1,7 @@
/* ir-nec-decoder.c - handle NEC IR Pulse/Space protocol // SPDX-License-Identifier: GPL-2.0
* // ir-nec-decoder.c - handle NEC IR Pulse/Space protocol
* Copyright (C) 2010 by Mauro Carvalho Chehab //
* // Copyright (C) 2010 by Mauro Carvalho Chehab
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <linux/bitrev.h> #include <linux/bitrev.h>
#include <linux/module.h> #include <linux/module.h>
@ -281,7 +272,7 @@ static void __exit ir_nec_decode_exit(void)
module_init(ir_nec_decode_init); module_init(ir_nec_decode_init);
module_exit(ir_nec_decode_exit); module_exit(ir_nec_decode_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Mauro Carvalho Chehab"); MODULE_AUTHOR("Mauro Carvalho Chehab");
MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)"); MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
MODULE_DESCRIPTION("NEC IR protocol decoder"); MODULE_DESCRIPTION("NEC IR protocol decoder");

21
drivers/media/rc/ir-rc5-decoder.c
View File

@ -1,17 +1,8 @@
/* ir-rc5-decoder.c - decoder for RC5(x) and StreamZap protocols // SPDX-License-Identifier: GPL-2.0
* // ir-rc5-decoder.c - decoder for RC5(x) and StreamZap protocols
* Copyright (C) 2010 by Mauro Carvalho Chehab //
* Copyright (C) 2010 by Jarod Wilson <jarod@redhat.com> // Copyright (C) 2010 by Mauro Carvalho Chehab
* // Copyright (C) 2010 by Jarod Wilson <jarod@redhat.com>
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
/* /*
* This decoder handles the 14 bit RC5 protocol, 15 bit "StreamZap" protocol * This decoder handles the 14 bit RC5 protocol, 15 bit "StreamZap" protocol
@ -300,7 +291,7 @@ static void __exit ir_rc5_decode_exit(void)
module_init(ir_rc5_decode_init); module_init(ir_rc5_decode_init);
module_exit(ir_rc5_decode_exit); module_exit(ir_rc5_decode_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Mauro Carvalho Chehab and Jarod Wilson"); MODULE_AUTHOR("Mauro Carvalho Chehab and Jarod Wilson");
MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)"); MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
MODULE_DESCRIPTION("RC5(x/sz) IR protocol decoder"); MODULE_DESCRIPTION("RC5(x/sz) IR protocol decoder");

37
drivers/media/rc/ir-sanyo-decoder.c
View File

@ -1,25 +1,16 @@
/* ir-sanyo-decoder.c - handle SANYO IR Pulse/Space protocol // SPDX-License-Identifier: GPL-2.0
* // ir-sanyo-decoder.c - handle SANYO IR Pulse/Space protocol
* Copyright (C) 2011 by Mauro Carvalho Chehab //
* // Copyright (C) 2011 by Mauro Carvalho Chehab
* This program is free software; you can redistribute it and/or modify //
* it under the terms of the GNU General Public License as published by // This protocol uses the NEC protocol timings. However, data is formatted as:
* the Free Software Foundation version 2 of the License. // 13 bits Custom Code
* // 13 bits NOT(Custom Code)
* This program is distributed in the hope that it will be useful, // 8 bits Key data
* but WITHOUT ANY WARRANTY; without even the implied warranty of // 8 bits NOT(Key data)
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
* GNU General Public License for more details. // According with LIRC, this protocol is used on Sanyo, Aiwa and Chinon
* // Information for this protocol is available at the Sanyo LC7461 datasheet.
* This protocol uses the NEC protocol timings. However, data is formatted as:
* 13 bits Custom Code
* 13 bits NOT(Custom Code)
* 8 bits Key data
* 8 bits NOT(Key data)
*
* According with LIRC, this protocol is used on Sanyo, Aiwa and Chinon
* Information for this protocol is available at the Sanyo LC7461 datasheet.
*/
#include <linux/module.h> #include <linux/module.h>
#include <linux/bitrev.h> #include <linux/bitrev.h>
@ -236,7 +227,7 @@ static void __exit ir_sanyo_decode_exit(void)
module_init(ir_sanyo_decode_init); module_init(ir_sanyo_decode_init);
module_exit(ir_sanyo_decode_exit); module_exit(ir_sanyo_decode_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Mauro Carvalho Chehab"); MODULE_AUTHOR("Mauro Carvalho Chehab");
MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)"); MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
MODULE_DESCRIPTION("SANYO IR protocol decoder"); MODULE_DESCRIPTION("SANYO IR protocol decoder");

18
drivers/media/rc/rc-core-priv.h
View File

@ -1,17 +1,7 @@
/* // SPDX-License-Identifier: GPL-2.0
* Remote Controller core raw events header // Remote Controller core raw events header
* //
* Copyright (C) 2010 by Mauro Carvalho Chehab // Copyright (C) 2010 by Mauro Carvalho Chehab
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#ifndef _RC_CORE_PRIV #ifndef _RC_CORE_PRIV
#define _RC_CORE_PRIV #define _RC_CORE_PRIV

17
drivers/media/rc/rc-ir-raw.c
View File

@ -1,16 +1,7 @@
/* rc-ir-raw.c - handle IR pulse/space events // SPDX-License-Identifier: GPL-2.0
* // rc-ir-raw.c - handle IR pulse/space events
* Copyright (C) 2010 by Mauro Carvalho Chehab //
* // Copyright (C) 2010 by Mauro Carvalho Chehab
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <linux/export.h> #include <linux/export.h>
#include <linux/kthread.h> #include <linux/kthread.h>

19
drivers/media/rc/rc-main.c
View File

@ -1,16 +1,7 @@
/* rc-main.c - Remote Controller core module // SPDX-License-Identifier: GPL-2.0
* // rc-main.c - Remote Controller core module
* Copyright (C) 2009-2010 by Mauro Carvalho Chehab //
* // Copyright (C) 2009-2010 by Mauro Carvalho Chehab
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@ -1905,4 +1896,4 @@ EXPORT_SYMBOL_GPL(rc_core_debug);
module_param_named(debug, rc_core_debug, int, 0644); module_param_named(debug, rc_core_debug, int, 0644);
MODULE_AUTHOR("Mauro Carvalho Chehab"); MODULE_AUTHOR("Mauro Carvalho Chehab");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL v2");