diff options
author | Johan Hovold <johan@kernel.org> | 2017-11-03 13:12:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-04 06:58:00 -0400 |
commit | 627cfa89b1fe8d189ee71718fe9eb607026db301 (patch) | |
tree | 96202baa6649f49fd019b70f394b056d17cf6355 | |
parent | 366122afb8198d4d6a9bd4301eabbe8282691e93 (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.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ch341.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/cp210x.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/empeg.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/metro-usb.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/mos7720.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/navman.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/omninet.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/opticon.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/option.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/oti6858.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/pl2303.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/qcaux.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/quatech2.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/sierra.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ssu100.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/symbolserial.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/usb-serial-simple.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/usb_debug.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/usb_wwan.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/visor.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/xsens_mt.c | 2 |
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 | ||
159 | MODULE_AUTHOR(DRIVER_AUTHOR); | 159 | MODULE_AUTHOR(DRIVER_AUTHOR); |
160 | MODULE_DESCRIPTION(DRIVER_DESC); | 160 | MODULE_DESCRIPTION(DRIVER_DESC); |
161 | MODULE_LICENSE("GPL"); | 161 | MODULE_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 | ||
642 | module_usb_serial_driver(serial_drivers, id_table); | 642 | module_usb_serial_driver(serial_drivers, id_table); |
643 | 643 | ||
644 | MODULE_LICENSE("GPL"); | 644 | MODULE_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) | |||
1526 | module_usb_serial_driver(serial_drivers, id_table); | 1526 | module_usb_serial_driver(serial_drivers, id_table); |
1527 | 1527 | ||
1528 | MODULE_DESCRIPTION(DRIVER_DESC); | 1528 | MODULE_DESCRIPTION(DRIVER_DESC); |
1529 | MODULE_LICENSE("GPL"); | 1529 | MODULE_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 | ||
124 | MODULE_AUTHOR(DRIVER_AUTHOR); | 124 | MODULE_AUTHOR(DRIVER_AUTHOR); |
125 | MODULE_DESCRIPTION(DRIVER_DESC); | 125 | MODULE_DESCRIPTION(DRIVER_DESC); |
126 | MODULE_LICENSE("GPL"); | 126 | MODULE_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 | ||
369 | module_usb_serial_driver(serial_drivers, id_table); | 369 | module_usb_serial_driver(serial_drivers, id_table); |
370 | 370 | ||
371 | MODULE_LICENSE("GPL"); | 371 | MODULE_LICENSE("GPL v2"); |
372 | MODULE_AUTHOR("Philip Nicastro"); | 372 | MODULE_AUTHOR("Philip Nicastro"); |
373 | MODULE_AUTHOR("Aleksey Babahin <tamerlan311@gmail.com>"); | 373 | MODULE_AUTHOR("Aleksey Babahin <tamerlan311@gmail.com>"); |
374 | MODULE_DESCRIPTION(DRIVER_DESC); | 374 | MODULE_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 | ||
2041 | MODULE_AUTHOR(DRIVER_AUTHOR); | 2041 | MODULE_AUTHOR(DRIVER_AUTHOR); |
2042 | MODULE_DESCRIPTION(DRIVER_DESC); | 2042 | MODULE_DESCRIPTION(DRIVER_DESC); |
2043 | MODULE_LICENSE("GPL"); | 2043 | MODULE_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 | ||
113 | module_usb_serial_driver(serial_drivers, id_table); | 113 | module_usb_serial_driver(serial_drivers, id_table); |
114 | 114 | ||
115 | MODULE_LICENSE("GPL"); | 115 | MODULE_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 | ||
177 | MODULE_AUTHOR(DRIVER_AUTHOR); | 177 | MODULE_AUTHOR(DRIVER_AUTHOR); |
178 | MODULE_DESCRIPTION(DRIVER_DESC); | 178 | MODULE_DESCRIPTION(DRIVER_DESC); |
179 | MODULE_LICENSE("GPL"); | 179 | MODULE_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[] = { | |||
417 | module_usb_serial_driver(serial_drivers, id_table); | 417 | module_usb_serial_driver(serial_drivers, id_table); |
418 | 418 | ||
419 | MODULE_DESCRIPTION(DRIVER_DESC); | 419 | MODULE_DESCRIPTION(DRIVER_DESC); |
420 | MODULE_LICENSE("GPL"); | 420 | MODULE_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 | ||
2204 | MODULE_AUTHOR(DRIVER_AUTHOR); | 2204 | MODULE_AUTHOR(DRIVER_AUTHOR); |
2205 | MODULE_DESCRIPTION(DRIVER_DESC); | 2205 | MODULE_DESCRIPTION(DRIVER_DESC); |
2206 | MODULE_LICENSE("GPL"); | 2206 | MODULE_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 | ||
845 | MODULE_DESCRIPTION(OTI6858_DESCRIPTION); | 845 | MODULE_DESCRIPTION(OTI6858_DESCRIPTION); |
846 | MODULE_AUTHOR(OTI6858_AUTHOR); | 846 | MODULE_AUTHOR(OTI6858_AUTHOR); |
847 | MODULE_LICENSE("GPL"); | 847 | MODULE_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[] = { | |||
1022 | module_usb_serial_driver(serial_drivers, id_table); | 1022 | module_usb_serial_driver(serial_drivers, id_table); |
1023 | 1023 | ||
1024 | MODULE_DESCRIPTION("Prolific PL2303 USB to serial adaptor driver"); | 1024 | MODULE_DESCRIPTION("Prolific PL2303 USB to serial adaptor driver"); |
1025 | MODULE_LICENSE("GPL"); | 1025 | MODULE_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 | ||
86 | module_usb_serial_driver(serial_drivers, id_table); | 86 | module_usb_serial_driver(serial_drivers, id_table); |
87 | MODULE_LICENSE("GPL"); | 87 | MODULE_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[] = { | |||
1023 | module_usb_serial_driver(serial_drivers, id_table); | 1023 | module_usb_serial_driver(serial_drivers, id_table); |
1024 | 1024 | ||
1025 | MODULE_DESCRIPTION(DRIVER_DESC); | 1025 | MODULE_DESCRIPTION(DRIVER_DESC); |
1026 | MODULE_LICENSE("GPL"); | 1026 | MODULE_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 | ||
1076 | MODULE_AUTHOR(DRIVER_AUTHOR); | 1076 | MODULE_AUTHOR(DRIVER_AUTHOR); |
1077 | MODULE_DESCRIPTION(DRIVER_DESC); | 1077 | MODULE_DESCRIPTION(DRIVER_DESC); |
1078 | MODULE_LICENSE("GPL"); | 1078 | MODULE_LICENSE("GPL v2"); |
1079 | 1079 | ||
1080 | module_param(nmea, bool, S_IRUGO | S_IWUSR); | 1080 | module_param(nmea, bool, S_IRUGO | S_IWUSR); |
1081 | MODULE_PARM_DESC(nmea, "NMEA streaming"); | 1081 | MODULE_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[] = { | |||
577 | module_usb_serial_driver(serial_drivers, id_table); | 577 | module_usb_serial_driver(serial_drivers, id_table); |
578 | 578 | ||
579 | MODULE_DESCRIPTION(DRIVER_DESC); | 579 | MODULE_DESCRIPTION(DRIVER_DESC); |
580 | MODULE_LICENSE("GPL"); | 580 | MODULE_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 | ||
192 | module_usb_serial_driver(serial_drivers, id_table); | 192 | module_usb_serial_driver(serial_drivers, id_table); |
193 | 193 | ||
194 | MODULE_LICENSE("GPL"); | 194 | MODULE_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[] = { | |||
131 | MODULE_DEVICE_TABLE(usb, id_table); | 131 | MODULE_DEVICE_TABLE(usb, id_table); |
132 | 132 | ||
133 | module_usb_serial_driver(serial_drivers, id_table); | 133 | module_usb_serial_driver(serial_drivers, id_table); |
134 | MODULE_LICENSE("GPL"); | 134 | MODULE_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 | ||
1436 | MODULE_AUTHOR(DRIVER_AUTHOR); | 1436 | MODULE_AUTHOR(DRIVER_AUTHOR); |
1437 | MODULE_DESCRIPTION(DRIVER_DESC); | 1437 | MODULE_DESCRIPTION(DRIVER_DESC); |
1438 | MODULE_LICENSE("GPL"); | 1438 | MODULE_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 | ||
97 | module_usb_serial_driver(serial_drivers, id_table_combined); | 97 | module_usb_serial_driver(serial_drivers, id_table_combined); |
98 | MODULE_LICENSE("GPL"); | 98 | MODULE_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 | ||
721 | MODULE_AUTHOR(DRIVER_AUTHOR); | 721 | MODULE_AUTHOR(DRIVER_AUTHOR); |
722 | MODULE_DESCRIPTION(DRIVER_DESC); | 722 | MODULE_DESCRIPTION(DRIVER_DESC); |
723 | MODULE_LICENSE("GPL"); | 723 | MODULE_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 | ||
577 | MODULE_AUTHOR(DRIVER_AUTHOR); | 577 | MODULE_AUTHOR(DRIVER_AUTHOR); |
578 | MODULE_DESCRIPTION(DRIVER_DESC); | 578 | MODULE_DESCRIPTION(DRIVER_DESC); |
579 | MODULE_LICENSE("GPL"); | 579 | MODULE_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 | ||
67 | MODULE_AUTHOR("Frans Klaver <frans.klaver@xsens.com>"); | 67 | MODULE_AUTHOR("Frans Klaver <frans.klaver@xsens.com>"); |
68 | MODULE_DESCRIPTION("USB-serial driver for Xsens motion trackers"); | 68 | MODULE_DESCRIPTION("USB-serial driver for Xsens motion trackers"); |
69 | MODULE_LICENSE("GPL"); | 69 | MODULE_LICENSE("GPL v2"); |