summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-11-03 13:12:08 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-04 06:58:00 -0400
commit627cfa89b1fe8d189ee71718fe9eb607026db301 (patch)
tree96202baa6649f49fd019b70f394b056d17cf6355
parent366122afb8198d4d6a9bd4301eabbe8282691e93 (diff)
USB: serial: fix module-license macros
Several GPL-2.0 drivers used "GPL" rather than "GPL v2" in their MODULE_LICENSE macros; fix the macros to match the licenses. Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/aircable.c2
-rw-r--r--drivers/usb/serial/ch341.c2
-rw-r--r--drivers/usb/serial/cp210x.c2
-rw-r--r--drivers/usb/serial/empeg.c2
-rw-r--r--drivers/usb/serial/metro-usb.c2
-rw-r--r--drivers/usb/serial/mos7720.c2
-rw-r--r--drivers/usb/serial/navman.c2
-rw-r--r--drivers/usb/serial/omninet.c2
-rw-r--r--drivers/usb/serial/opticon.c2
-rw-r--r--drivers/usb/serial/option.c2
-rw-r--r--drivers/usb/serial/oti6858.c2
-rw-r--r--drivers/usb/serial/pl2303.c2
-rw-r--r--drivers/usb/serial/qcaux.c2
-rw-r--r--drivers/usb/serial/quatech2.c2
-rw-r--r--drivers/usb/serial/sierra.c2
-rw-r--r--drivers/usb/serial/ssu100.c2
-rw-r--r--drivers/usb/serial/symbolserial.c2
-rw-r--r--drivers/usb/serial/usb-serial-simple.c2
-rw-r--r--drivers/usb/serial/usb-serial.c2
-rw-r--r--drivers/usb/serial/usb_debug.c2
-rw-r--r--drivers/usb/serial/usb_wwan.c2
-rw-r--r--drivers/usb/serial/visor.c2
-rw-r--r--drivers/usb/serial/xsens_mt.c2
23 files changed, 23 insertions, 23 deletions
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 1a1a6b832451..84d52953dd0a 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -158,4 +158,4 @@ module_usb_serial_driver(serial_drivers, id_table);
158 158
159MODULE_AUTHOR(DRIVER_AUTHOR); 159MODULE_AUTHOR(DRIVER_AUTHOR);
160MODULE_DESCRIPTION(DRIVER_DESC); 160MODULE_DESCRIPTION(DRIVER_DESC);
161MODULE_LICENSE("GPL"); 161MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 06a1e4e63cc4..bdd7a5ad3bf1 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -641,4 +641,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
641 641
642module_usb_serial_driver(serial_drivers, id_table); 642module_usb_serial_driver(serial_drivers, id_table);
643 643
644MODULE_LICENSE("GPL"); 644MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index ca5977a52f34..7c6273bf5beb 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -1526,4 +1526,4 @@ static void cp210x_release(struct usb_serial *serial)
1526module_usb_serial_driver(serial_drivers, id_table); 1526module_usb_serial_driver(serial_drivers, id_table);
1527 1527
1528MODULE_DESCRIPTION(DRIVER_DESC); 1528MODULE_DESCRIPTION(DRIVER_DESC);
1529MODULE_LICENSE("GPL"); 1529MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index d9f2bb37e4cd..d680bec62547 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -123,4 +123,4 @@ module_usb_serial_driver(serial_drivers, id_table);
123 123
124MODULE_AUTHOR(DRIVER_AUTHOR); 124MODULE_AUTHOR(DRIVER_AUTHOR);
125MODULE_DESCRIPTION(DRIVER_DESC); 125MODULE_DESCRIPTION(DRIVER_DESC);
126MODULE_LICENSE("GPL"); 126MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index 2832810c9693..e63cea02cfd8 100644
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -368,7 +368,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
368 368
369module_usb_serial_driver(serial_drivers, id_table); 369module_usb_serial_driver(serial_drivers, id_table);
370 370
371MODULE_LICENSE("GPL"); 371MODULE_LICENSE("GPL v2");
372MODULE_AUTHOR("Philip Nicastro"); 372MODULE_AUTHOR("Philip Nicastro");
373MODULE_AUTHOR("Aleksey Babahin <tamerlan311@gmail.com>"); 373MODULE_AUTHOR("Aleksey Babahin <tamerlan311@gmail.com>");
374MODULE_DESCRIPTION(DRIVER_DESC); 374MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 553c74d7ca2a..f4df3d5bf69c 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -2040,4 +2040,4 @@ module_usb_serial_driver(serial_drivers, id_table);
2040 2040
2041MODULE_AUTHOR(DRIVER_AUTHOR); 2041MODULE_AUTHOR(DRIVER_AUTHOR);
2042MODULE_DESCRIPTION(DRIVER_DESC); 2042MODULE_DESCRIPTION(DRIVER_DESC);
2043MODULE_LICENSE("GPL"); 2043MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c
index 7afb9fc479b4..20277c52dded 100644
--- a/drivers/usb/serial/navman.c
+++ b/drivers/usb/serial/navman.c
@@ -112,4 +112,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
112 112
113module_usb_serial_driver(serial_drivers, id_table); 113module_usb_serial_driver(serial_drivers, id_table);
114 114
115MODULE_LICENSE("GPL"); 115MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 13d15a0b5e1f..e51c9464ea42 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -176,4 +176,4 @@ module_usb_serial_driver(serial_drivers, id_table);
176 176
177MODULE_AUTHOR(DRIVER_AUTHOR); 177MODULE_AUTHOR(DRIVER_AUTHOR);
178MODULE_DESCRIPTION(DRIVER_DESC); 178MODULE_DESCRIPTION(DRIVER_DESC);
179MODULE_LICENSE("GPL"); 179MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index fd9d8aa34353..caa0746326fd 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -417,4 +417,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
417module_usb_serial_driver(serial_drivers, id_table); 417module_usb_serial_driver(serial_drivers, id_table);
418 418
419MODULE_DESCRIPTION(DRIVER_DESC); 419MODULE_DESCRIPTION(DRIVER_DESC);
420MODULE_LICENSE("GPL"); 420MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index f576397b1fe9..aaa7d901a06d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -2203,4 +2203,4 @@ static void option_instat_callback(struct urb *urb)
2203 2203
2204MODULE_AUTHOR(DRIVER_AUTHOR); 2204MODULE_AUTHOR(DRIVER_AUTHOR);
2205MODULE_DESCRIPTION(DRIVER_DESC); 2205MODULE_DESCRIPTION(DRIVER_DESC);
2206MODULE_LICENSE("GPL"); 2206MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index bbde22c99cb3..ae9cb15ee02d 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -844,4 +844,4 @@ module_usb_serial_driver(serial_drivers, id_table);
844 844
845MODULE_DESCRIPTION(OTI6858_DESCRIPTION); 845MODULE_DESCRIPTION(OTI6858_DESCRIPTION);
846MODULE_AUTHOR(OTI6858_AUTHOR); 846MODULE_AUTHOR(OTI6858_AUTHOR);
847MODULE_LICENSE("GPL"); 847MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 71fbf2ff1fc3..57ae832a49ff 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -1022,4 +1022,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
1022module_usb_serial_driver(serial_drivers, id_table); 1022module_usb_serial_driver(serial_drivers, id_table);
1023 1023
1024MODULE_DESCRIPTION("Prolific PL2303 USB to serial adaptor driver"); 1024MODULE_DESCRIPTION("Prolific PL2303 USB to serial adaptor driver");
1025MODULE_LICENSE("GPL"); 1025MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c
index 5078f79bc5a4..929ffba663f2 100644
--- a/drivers/usb/serial/qcaux.c
+++ b/drivers/usb/serial/qcaux.c
@@ -84,4 +84,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
84}; 84};
85 85
86module_usb_serial_driver(serial_drivers, id_table); 86module_usb_serial_driver(serial_drivers, id_table);
87MODULE_LICENSE("GPL"); 87MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 804734dd88a0..958e12e1e7c7 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -1023,4 +1023,4 @@ static struct usb_serial_driver *const serial_drivers[] = {
1023module_usb_serial_driver(serial_drivers, id_table); 1023module_usb_serial_driver(serial_drivers, id_table);
1024 1024
1025MODULE_DESCRIPTION(DRIVER_DESC); 1025MODULE_DESCRIPTION(DRIVER_DESC);
1026MODULE_LICENSE("GPL"); 1026MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 276f055a2925..d189f953c891 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -1075,7 +1075,7 @@ module_usb_serial_driver(serial_drivers, id_table);
1075 1075
1076MODULE_AUTHOR(DRIVER_AUTHOR); 1076MODULE_AUTHOR(DRIVER_AUTHOR);
1077MODULE_DESCRIPTION(DRIVER_DESC); 1077MODULE_DESCRIPTION(DRIVER_DESC);
1078MODULE_LICENSE("GPL"); 1078MODULE_LICENSE("GPL v2");
1079 1079
1080module_param(nmea, bool, S_IRUGO | S_IWUSR); 1080module_param(nmea, bool, S_IRUGO | S_IWUSR);
1081MODULE_PARM_DESC(nmea, "NMEA streaming"); 1081MODULE_PARM_DESC(nmea, "NMEA streaming");
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index a7db9aff97a1..2083c267787b 100644
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -577,4 +577,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
577module_usb_serial_driver(serial_drivers, id_table); 577module_usb_serial_driver(serial_drivers, id_table);
578 578
579MODULE_DESCRIPTION(DRIVER_DESC); 579MODULE_DESCRIPTION(DRIVER_DESC);
580MODULE_LICENSE("GPL"); 580MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index c47d3a0cd4cf..cd2f8dc8b58c 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -191,4 +191,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
191 191
192module_usb_serial_driver(serial_drivers, id_table); 192module_usb_serial_driver(serial_drivers, id_table);
193 193
194MODULE_LICENSE("GPL"); 194MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c
index 2fc92d1d3c41..74172fe158df 100644
--- a/drivers/usb/serial/usb-serial-simple.c
+++ b/drivers/usb/serial/usb-serial-simple.c
@@ -131,4 +131,4 @@ static const struct usb_device_id id_table[] = {
131MODULE_DEVICE_TABLE(usb, id_table); 131MODULE_DEVICE_TABLE(usb, id_table);
132 132
133module_usb_serial_driver(serial_drivers, id_table); 133module_usb_serial_driver(serial_drivers, id_table);
134MODULE_LICENSE("GPL"); 134MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 38291c6e57ed..790e0cbe3da9 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1435,4 +1435,4 @@ EXPORT_SYMBOL_GPL(usb_serial_deregister_drivers);
1435 1435
1436MODULE_AUTHOR(DRIVER_AUTHOR); 1436MODULE_AUTHOR(DRIVER_AUTHOR);
1437MODULE_DESCRIPTION(DRIVER_DESC); 1437MODULE_DESCRIPTION(DRIVER_DESC);
1438MODULE_LICENSE("GPL"); 1438MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
index d28067142406..a657c6ec00bb 100644
--- a/drivers/usb/serial/usb_debug.c
+++ b/drivers/usb/serial/usb_debug.c
@@ -95,4 +95,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
95}; 95};
96 96
97module_usb_serial_driver(serial_drivers, id_table_combined); 97module_usb_serial_driver(serial_drivers, id_table_combined);
98MODULE_LICENSE("GPL"); 98MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index f9c722868935..107e64c42e94 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -720,4 +720,4 @@ EXPORT_SYMBOL(usb_wwan_resume);
720 720
721MODULE_AUTHOR(DRIVER_AUTHOR); 721MODULE_AUTHOR(DRIVER_AUTHOR);
722MODULE_DESCRIPTION(DRIVER_DESC); 722MODULE_DESCRIPTION(DRIVER_DESC);
723MODULE_LICENSE("GPL"); 723MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index cf6ba37092fb..f5373ed2cd45 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -576,4 +576,4 @@ module_usb_serial_driver(serial_drivers, id_table_combined);
576 576
577MODULE_AUTHOR(DRIVER_AUTHOR); 577MODULE_AUTHOR(DRIVER_AUTHOR);
578MODULE_DESCRIPTION(DRIVER_DESC); 578MODULE_DESCRIPTION(DRIVER_DESC);
579MODULE_LICENSE("GPL"); 579MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
index 7608323d62c5..cf262c9a9638 100644
--- a/drivers/usb/serial/xsens_mt.c
+++ b/drivers/usb/serial/xsens_mt.c
@@ -66,4 +66,4 @@ module_usb_serial_driver(serial_drivers, id_table);
66 66
67MODULE_AUTHOR("Frans Klaver <frans.klaver@xsens.com>"); 67MODULE_AUTHOR("Frans Klaver <frans.klaver@xsens.com>");
68MODULE_DESCRIPTION("USB-serial driver for Xsens motion trackers"); 68MODULE_DESCRIPTION("USB-serial driver for Xsens motion trackers");
69MODULE_LICENSE("GPL"); 69MODULE_LICENSE("GPL v2");