Skip to content

Commit

Permalink
USB: serial: fix module-license macros
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Nov 4, 2017
1 parent 366122a commit 627cfa8
Show file tree
Hide file tree
Showing 23 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion drivers/usb/serial/aircable.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,4 @@ module_usb_serial_driver(serial_drivers, id_table);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/ch341.c
Original file line number Diff line number Diff line change
Expand Up @@ -641,4 +641,4 @@ static struct usb_serial_driver * const serial_drivers[] = {

module_usb_serial_driver(serial_drivers, id_table);

MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/cp210x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1526,4 +1526,4 @@ static void cp210x_release(struct usb_serial *serial)
module_usb_serial_driver(serial_drivers, id_table);

MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/empeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,4 @@ module_usb_serial_driver(serial_drivers, id_table);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/metro-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ static struct usb_serial_driver * const serial_drivers[] = {

module_usb_serial_driver(serial_drivers, id_table);

MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Philip Nicastro");
MODULE_AUTHOR("Aleksey Babahin <tamerlan311@gmail.com>");
MODULE_DESCRIPTION(DRIVER_DESC);
2 changes: 1 addition & 1 deletion drivers/usb/serial/mos7720.c
Original file line number Diff line number Diff line change
Expand Up @@ -2040,4 +2040,4 @@ module_usb_serial_driver(serial_drivers, id_table);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/navman.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,4 @@ static struct usb_serial_driver * const serial_drivers[] = {

module_usb_serial_driver(serial_drivers, id_table);

MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/omninet.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,4 @@ module_usb_serial_driver(serial_drivers, id_table);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/opticon.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,4 +417,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
module_usb_serial_driver(serial_drivers, id_table);

MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/option.c
Original file line number Diff line number Diff line change
Expand Up @@ -2203,4 +2203,4 @@ static void option_instat_callback(struct urb *urb)

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/oti6858.c
Original file line number Diff line number Diff line change
Expand Up @@ -844,4 +844,4 @@ module_usb_serial_driver(serial_drivers, id_table);

MODULE_DESCRIPTION(OTI6858_DESCRIPTION);
MODULE_AUTHOR(OTI6858_AUTHOR);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/pl2303.c
Original file line number Diff line number Diff line change
Expand Up @@ -1022,4 +1022,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
module_usb_serial_driver(serial_drivers, id_table);

MODULE_DESCRIPTION("Prolific PL2303 USB to serial adaptor driver");
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/qcaux.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
};

module_usb_serial_driver(serial_drivers, id_table);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/quatech2.c
Original file line number Diff line number Diff line change
Expand Up @@ -1023,4 +1023,4 @@ static struct usb_serial_driver *const serial_drivers[] = {
module_usb_serial_driver(serial_drivers, id_table);

MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/sierra.c
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ module_usb_serial_driver(serial_drivers, id_table);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");

module_param(nmea, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(nmea, "NMEA streaming");
2 changes: 1 addition & 1 deletion drivers/usb/serial/ssu100.c
Original file line number Diff line number Diff line change
Expand Up @@ -577,4 +577,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
module_usb_serial_driver(serial_drivers, id_table);

MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/symbolserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,4 @@ static struct usb_serial_driver * const serial_drivers[] = {

module_usb_serial_driver(serial_drivers, id_table);

MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/usb-serial-simple.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ static const struct usb_device_id id_table[] = {
MODULE_DEVICE_TABLE(usb, id_table);

module_usb_serial_driver(serial_drivers, id_table);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/usb-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -1435,4 +1435,4 @@ EXPORT_SYMBOL_GPL(usb_serial_deregister_drivers);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/usb_debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ static struct usb_serial_driver * const serial_drivers[] = {
};

module_usb_serial_driver(serial_drivers, id_table_combined);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/usb_wwan.c
Original file line number Diff line number Diff line change
Expand Up @@ -720,4 +720,4 @@ EXPORT_SYMBOL(usb_wwan_resume);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/visor.c
Original file line number Diff line number Diff line change
Expand Up @@ -576,4 +576,4 @@ module_usb_serial_driver(serial_drivers, id_table_combined);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");
2 changes: 1 addition & 1 deletion drivers/usb/serial/xsens_mt.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ module_usb_serial_driver(serial_drivers, id_table);

MODULE_AUTHOR("Frans Klaver <frans.klaver@xsens.com>");
MODULE_DESCRIPTION("USB-serial driver for Xsens motion trackers");
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL v2");

0 comments on commit 627cfa8

Please sign in to comment.