Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: usb: add SPDX identifiers to some code I wrote

As we're now using SPDX identifiers, on 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>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

+67 -174
+7 -18
drivers/media/usb/au0828/au0828-input.c
··· 1 - /* 2 - handle au0828 IR remotes via linux kernel input layer. 3 - 4 - Copyright (C) 2014 Mauro Carvalho Chehab <mchehab@samsung.com> 5 - Copyright (c) 2014 Samsung Electronics Co., Ltd. 6 - 7 - Based on em28xx-input.c. 8 - 9 - This program is free software; you can redistribute it and/or modify 10 - it under the terms of the GNU General Public License as published by 11 - the Free Software Foundation; either version 2 of the License, or 12 - (at your option) any later version. 13 - 14 - This program is distributed in the hope that it will be useful, 15 - but WITHOUT ANY WARRANTY; without even the implied warranty of 16 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 17 - GNU General Public License for more details. 18 - */ 1 + // SPDX-License-Identifier: GPL-2.0+ 2 + // handle au0828 IR remotes via linux kernel input layer. 3 + // 4 + // Copyright (c) 2014 Mauro Carvalho Chehab <mchehab@samsung.com> 5 + // Copyright (c) 2014 Samsung Electronics Co., Ltd. 6 + // 7 + // Based on em28xx-input.c. 19 8 20 9 #include "au0828.h" 21 10
+9 -19
drivers/media/usb/cx231xx/cx231xx-input.c
··· 1 - /* 2 - * cx231xx IR glue driver 3 - * 4 - * Copyright (C) 2010 Mauro Carvalho Chehab 5 - * 6 - * Polaris (cx231xx) has its support for IR's with a design close to MCE. 7 - * however, a few designs are using an external I2C chip for IR, instead 8 - * of using the one provided by the chip. 9 - * This driver provides support for those extra devices 10 - * 11 - * This program is free software; you can redistribute it and/or 12 - * modify it under the terms of the GNU General Public License as 13 - * published by the Free Software Foundation version 2. 14 - * 15 - * This program is distributed in the hope that it will be useful, 16 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 17 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 18 - * General Public License for more details. 19 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // cx231xx IR glue driver 3 + // 4 + // Copyright (c) 2010 Mauro Carvalho Chehab <mchehab@kernel.org> 5 + // 6 + // Polaris (cx231xx) has its support for IR's with a design close to MCE. 7 + // however, a few designs are using an external I2C chip for IR, instead 8 + // of using the one provided by the chip. 9 + // This driver provides support for those extra devices 20 10 21 11 #include "cx231xx.h" 22 12 #include <linux/slab.h>
+6 -12
drivers/media/usb/tm6000/tm6000-alsa.c
··· 1 - /* 2 - * 3 - * Support for audio capture for tm5600/6000/6010 4 - * (c) 2007-2008 Mauro Carvalho Chehab 5 - * 6 - * Based on cx88-alsa.c 7 - * 8 - * This program is free software; you can redistribute it and/or modify 9 - * it under the terms of the GNU General Public License version 2 as 10 - * published by the Free Software Foundation. 11 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // Support for audio capture for tm5600/6000/6010 3 + // Copyright (c) 2007-2008 Mauro Carvalho Chehab <mchehab@kernel.org> 4 + // 5 + // Based on cx88-alsa.c 12 6 13 7 #include <linux/module.h> 14 8 #include <linux/init.h> ··· 51 57 52 58 MODULE_DESCRIPTION("ALSA driver module for tm5600/tm6000/tm6010 based TV cards"); 53 59 MODULE_AUTHOR("Mauro Carvalho Chehab"); 54 - MODULE_LICENSE("GPL"); 60 + MODULE_LICENSE("GPL v2"); 55 61 MODULE_SUPPORTED_DEVICE("{{Trident,tm5600},{{Trident,tm6000},{{Trident,tm6010}"); 56 62 static unsigned int debug; 57 63 module_param(debug, int, 0644);
+5 -15
drivers/media/usb/tm6000/tm6000-cards.c
··· 1 - /* 2 - * tm6000-cards.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 - * 4 - * Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 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 as published by 8 - * the Free Software Foundation version 2 9 - * 10 - * This program is distributed in the hope that it will be useful, 11 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 - * GNU General Public License for more details. 14 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // tm6000-cards.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 + // 4 + // Copyright (c) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 15 5 16 6 #include <linux/init.h> 17 7 #include <linux/module.h> ··· 1395 1405 1396 1406 MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000/TM6010 USB2 adapter"); 1397 1407 MODULE_AUTHOR("Mauro Carvalho Chehab"); 1398 - MODULE_LICENSE("GPL"); 1408 + MODULE_LICENSE("GPL v2");
+7 -17
drivers/media/usb/tm6000/tm6000-core.c
··· 1 - /* 2 - * tm6000-core.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 - * 4 - * Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 5 - * 6 - * Copyright (C) 2007 Michel Ludwig <michel.ludwig@gmail.com> 7 - * - DVB-T support 8 - * 9 - * This program is free software; you can redistribute it and/or modify 10 - * it under the terms of the GNU General Public License as published by 11 - * the Free Software Foundation version 2 12 - * 13 - * This program is distributed in the hope that it will be useful, 14 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 - * GNU General Public License for more details. 17 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // tm6000-core.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 + // 4 + // Copyright (c) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 5 + // 6 + // Copyright (c) 2007 Michel Ludwig <michel.ludwig@gmail.com> 7 + // - DVB-T support 18 8 19 9 #include <linux/module.h> 20 10 #include <linux/kernel.h>
+7 -17
drivers/media/usb/tm6000/tm6000-i2c.c
··· 1 - /* 2 - * tm6000-i2c.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 - * 4 - * Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 5 - * 6 - * Copyright (C) 2007 Michel Ludwig <michel.ludwig@gmail.com> 7 - * - Fix SMBus Read Byte command 8 - * 9 - * This program is free software; you can redistribute it and/or modify 10 - * it under the terms of the GNU General Public License as published by 11 - * the Free Software Foundation version 2 12 - * 13 - * This program is distributed in the hope that it will be useful, 14 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 - * GNU General Public License for more details. 17 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // tm6000-i2c.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 + // 4 + // Copyright (c) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 5 + // 6 + // Copyright (c) 2007 Michel Ludwig <michel.ludwig@gmail.com> 7 + // - Fix SMBus Read Byte command 18 8 19 9 #include <linux/module.h> 20 10 #include <linux/kernel.h>
+4 -14
drivers/media/usb/tm6000/tm6000-regs.h
··· 1 - /* 2 - * tm6000-regs.h - driver for TM5600/TM6000/TM6010 USB video capture devices 3 - * 4 - * Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 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 as published by 8 - * the Free Software Foundation version 2 9 - * 10 - * This program is distributed in the hope that it will be useful, 11 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 - * GNU General Public License for more details. 14 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // tm6000-regs.h - driver for TM5600/TM6000/TM6010 USB video capture devices 3 + // 4 + // Copyright (c) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 15 5 16 6 /* 17 7 * Define TV Master TM5600/TM6000/TM6010 Request codes
+4 -14
drivers/media/usb/tm6000/tm6000-stds.c
··· 1 - /* 2 - * tm6000-stds.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 - * 4 - * Copyright (C) 2007 Mauro Carvalho Chehab 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 as published by 8 - * the Free Software Foundation version 2 9 - * 10 - * This program is distributed in the hope that it will be useful, 11 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 - * GNU General Public License for more details. 14 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // tm6000-stds.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 + // 4 + // Copyright (c) 2007 Mauro Carvalho Chehab <mchehab@kernel.org> 15 5 16 6 #include <linux/module.h> 17 7 #include <linux/kernel.h>
+4 -14
drivers/media/usb/tm6000/tm6000-usb-isoc.h
··· 1 - /* 2 - * tm6000-buf.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 - * 4 - * Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 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 as published by 8 - * the Free Software Foundation version 2 9 - * 10 - * This program is distributed in the hope that it will be useful, 11 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 - * GNU General Public License for more details. 14 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // tm6000-buf.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 + // 4 + // Copyright (c) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 15 5 16 6 #include <linux/videodev2.h> 17 7
+7 -17
drivers/media/usb/tm6000/tm6000-video.c
··· 1 - /* 2 - * tm6000-video.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 - * 4 - * Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 5 - * 6 - * Copyright (C) 2007 Michel Ludwig <michel.ludwig@gmail.com> 7 - * - Fixed module load/unload 8 - * 9 - * This program is free software; you can redistribute it and/or modify 10 - * it under the terms of the GNU General Public License as published by 11 - * the Free Software Foundation version 2 12 - * 13 - * This program is distributed in the hope that it will be useful, 14 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 - * GNU General Public License for more details. 17 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // tm6000-video.c - driver for TM5600/TM6000/TM6010 USB video capture devices 3 + // 4 + // Copyright (c) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 5 + // 6 + // Copyright (c) 2007 Michel Ludwig <michel.ludwig@gmail.com> 7 + // - Fixed module load/unload 18 8 19 9 #include <linux/module.h> 20 10 #include <linux/delay.h>
+7 -17
drivers/media/usb/tm6000/tm6000.h
··· 1 - /* 2 - * tm6000.h - driver for TM5600/TM6000/TM6010 USB video capture devices 3 - * 4 - * Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 5 - * 6 - * Copyright (C) 2007 Michel Ludwig <michel.ludwig@gmail.com> 7 - * - DVB-T support 8 - * 9 - * This program is free software; you can redistribute it and/or modify 10 - * it under the terms of the GNU General Public License as published by 11 - * the Free Software Foundation version 2 12 - * 13 - * This program is distributed in the hope that it will be useful, 14 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 - * GNU General Public License for more details. 17 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // tm6000.h - driver for TM5600/TM6000/TM6010 USB video capture devices 3 + // 4 + // Copyright (c) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 5 + // 6 + // Copyright (c) 2007 Michel Ludwig <michel.ludwig@gmail.com> 7 + // - DVB-T support 18 8 19 9 #include <linux/videodev2.h> 20 10 #include <media/v4l2-common.h>