diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-19 08:17:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-22 09:56:52 -0400 |
commit | c35c376fb1be1fc7c96e944898f92ee45158f8b1 (patch) | |
tree | 27616503335b86cbf728e27d04e6278bab700fac | |
parent | 4b26ebacb6cc8a86ce55dbeabbf5fe8887f5b1de (diff) |
USB: misc: remove unneeded MODULE_VERSION() usage
MODULE_VERSION is useless for in-kernel drivers, so just remove all
usage of it in the USB misc drivers. Along with this, some
DRIVER_VERSION macros were removed as they are also pointless.
Cc: Keith Packard <keithp@keithp.com>
Cc: Juergen Stuber <starblue@users.sourceforge.net>
Cc: Cesar Miquel <miquel@df.uba.ar>
Acked-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/misc/adutux.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/chaoskey.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/cytherm.c | 1 | ||||
-rw-r--r-- | drivers/usb/misc/idmouse.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/iowarrior.c | 4 | ||||
-rw-r--r-- | drivers/usb/misc/ldusb.c | 1 | ||||
-rw-r--r-- | drivers/usb/misc/legousbtower.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/rio500.c | 4 | ||||
-rw-r--r-- | drivers/usb/misc/trancevibrator.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/usb251xb.c | 1 | ||||
-rw-r--r-- | drivers/usb/misc/uss720.c | 7 |
11 files changed, 2 insertions, 26 deletions
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index dfd54ea4808f..1c0ada75c35d 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c | |||
@@ -29,8 +29,6 @@ | |||
29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
30 | #include <linux/uaccess.h> | 30 | #include <linux/uaccess.h> |
31 | 31 | ||
32 | /* Version Information */ | ||
33 | #define DRIVER_VERSION "v0.0.13" | ||
34 | #define DRIVER_AUTHOR "John Homppi" | 32 | #define DRIVER_AUTHOR "John Homppi" |
35 | #define DRIVER_DESC "adutux (see www.ontrak.net)" | 33 | #define DRIVER_DESC "adutux (see www.ontrak.net)" |
36 | 34 | ||
diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c index 15d4e64d3b65..abec6e604a62 100644 --- a/drivers/usb/misc/chaoskey.c +++ b/drivers/usb/misc/chaoskey.c | |||
@@ -42,12 +42,10 @@ static int chaoskey_rng_read(struct hwrng *rng, void *data, | |||
42 | dev_err(&(usb_if)->dev, format, ## arg) | 42 | dev_err(&(usb_if)->dev, format, ## arg) |
43 | 43 | ||
44 | /* Version Information */ | 44 | /* Version Information */ |
45 | #define DRIVER_VERSION "v0.1" | ||
46 | #define DRIVER_AUTHOR "Keith Packard, keithp@keithp.com" | 45 | #define DRIVER_AUTHOR "Keith Packard, keithp@keithp.com" |
47 | #define DRIVER_DESC "Altus Metrum ChaosKey driver" | 46 | #define DRIVER_DESC "Altus Metrum ChaosKey driver" |
48 | #define DRIVER_SHORT "chaoskey" | 47 | #define DRIVER_SHORT "chaoskey" |
49 | 48 | ||
50 | MODULE_VERSION(DRIVER_VERSION); | ||
51 | MODULE_AUTHOR(DRIVER_AUTHOR); | 49 | MODULE_AUTHOR(DRIVER_AUTHOR); |
52 | MODULE_DESCRIPTION(DRIVER_DESC); | 50 | MODULE_DESCRIPTION(DRIVER_DESC); |
53 | MODULE_LICENSE("GPL"); | 51 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c index 9d8bb8dacdcd..63207c42acf6 100644 --- a/drivers/usb/misc/cytherm.c +++ b/drivers/usb/misc/cytherm.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/usb.h> | 21 | #include <linux/usb.h> |
22 | 22 | ||
23 | #define DRIVER_VERSION "v1.0" | ||
24 | #define DRIVER_AUTHOR "Erik Rigtorp" | 23 | #define DRIVER_AUTHOR "Erik Rigtorp" |
25 | #define DRIVER_DESC "Cypress USB Thermometer driver" | 24 | #define DRIVER_DESC "Cypress USB Thermometer driver" |
26 | 25 | ||
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index 81fcbf024c65..39d8fedfaf3b 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
@@ -33,8 +33,6 @@ | |||
33 | #define HEADER "P5 225 289 255 " | 33 | #define HEADER "P5 225 289 255 " |
34 | #define IMGSIZE ((WIDTH * HEIGHT) + sizeof(HEADER)-1) | 34 | #define IMGSIZE ((WIDTH * HEIGHT) + sizeof(HEADER)-1) |
35 | 35 | ||
36 | /* version information */ | ||
37 | #define DRIVER_VERSION "0.6" | ||
38 | #define DRIVER_SHORT "idmouse" | 36 | #define DRIVER_SHORT "idmouse" |
39 | #define DRIVER_AUTHOR "Florian 'Floe' Echtler <echtler@fs.tum.de>" | 37 | #define DRIVER_AUTHOR "Florian 'Floe' Echtler <echtler@fs.tum.de>" |
40 | #define DRIVER_DESC "Siemens ID Mouse FingerTIP Sensor Driver" | 38 | #define DRIVER_DESC "Siemens ID Mouse FingerTIP Sensor Driver" |
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index 7ca4c7e0ea0d..be5881303681 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c | |||
@@ -21,10 +21,8 @@ | |||
21 | #include <linux/poll.h> | 21 | #include <linux/poll.h> |
22 | #include <linux/usb/iowarrior.h> | 22 | #include <linux/usb/iowarrior.h> |
23 | 23 | ||
24 | /* Version Information */ | ||
25 | #define DRIVER_VERSION "v0.4.0" | ||
26 | #define DRIVER_AUTHOR "Christian Lucht <lucht@codemercs.com>" | 24 | #define DRIVER_AUTHOR "Christian Lucht <lucht@codemercs.com>" |
27 | #define DRIVER_DESC "USB IO-Warrior driver (Linux 2.6.x)" | 25 | #define DRIVER_DESC "USB IO-Warrior driver" |
28 | 26 | ||
29 | #define USB_VENDOR_ID_CODEMERCS 1984 | 27 | #define USB_VENDOR_ID_CODEMERCS 1984 |
30 | /* low speed iowarrior */ | 28 | /* low speed iowarrior */ |
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index 9d9487c66f87..680bddb3ce05 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c | |||
@@ -112,7 +112,6 @@ static const struct usb_device_id ld_usb_table[] = { | |||
112 | { } /* Terminating entry */ | 112 | { } /* Terminating entry */ |
113 | }; | 113 | }; |
114 | MODULE_DEVICE_TABLE(usb, ld_usb_table); | 114 | MODULE_DEVICE_TABLE(usb, ld_usb_table); |
115 | MODULE_VERSION("V0.14"); | ||
116 | MODULE_AUTHOR("Michael Hund <mhund@ld-didactic.de>"); | 115 | MODULE_AUTHOR("Michael Hund <mhund@ld-didactic.de>"); |
117 | MODULE_DESCRIPTION("LD USB Driver"); | 116 | MODULE_DESCRIPTION("LD USB Driver"); |
118 | MODULE_LICENSE("GPL"); | 117 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c index 0782ac6f5edf..5628f678ab59 100644 --- a/drivers/usb/misc/legousbtower.c +++ b/drivers/usb/misc/legousbtower.c | |||
@@ -88,8 +88,6 @@ | |||
88 | #include <linux/poll.h> | 88 | #include <linux/poll.h> |
89 | 89 | ||
90 | 90 | ||
91 | /* Version Information */ | ||
92 | #define DRIVER_VERSION "v0.96" | ||
93 | #define DRIVER_AUTHOR "Juergen Stuber <starblue@sourceforge.net>" | 91 | #define DRIVER_AUTHOR "Juergen Stuber <starblue@sourceforge.net>" |
94 | #define DRIVER_DESC "LEGO USB Tower Driver" | 92 | #define DRIVER_DESC "LEGO USB Tower Driver" |
95 | 93 | ||
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c index b106ce76997b..ddfebb144aaa 100644 --- a/drivers/usb/misc/rio500.c +++ b/drivers/usb/misc/rio500.c | |||
@@ -43,10 +43,6 @@ | |||
43 | 43 | ||
44 | #include "rio500_usb.h" | 44 | #include "rio500_usb.h" |
45 | 45 | ||
46 | /* | ||
47 | * Version Information | ||
48 | */ | ||
49 | #define DRIVER_VERSION "v1.1" | ||
50 | #define DRIVER_AUTHOR "Cesar Miquel <miquel@df.uba.ar>" | 46 | #define DRIVER_AUTHOR "Cesar Miquel <miquel@df.uba.ar>" |
51 | #define DRIVER_DESC "USB Rio 500 driver" | 47 | #define DRIVER_DESC "USB Rio 500 driver" |
52 | 48 | ||
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c index 9795457723d8..1862ed15ce28 100644 --- a/drivers/usb/misc/trancevibrator.c +++ b/drivers/usb/misc/trancevibrator.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | #include <linux/usb.h> | 26 | #include <linux/usb.h> |
27 | 27 | ||
28 | /* Version Information */ | ||
29 | #define DRIVER_VERSION "v1.1" | ||
30 | #define DRIVER_AUTHOR "Sam Hocevar, sam@zoy.org" | 28 | #define DRIVER_AUTHOR "Sam Hocevar, sam@zoy.org" |
31 | #define DRIVER_DESC "PlayStation 2 Trance Vibrator driver" | 29 | #define DRIVER_DESC "PlayStation 2 Trance Vibrator driver" |
32 | 30 | ||
diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c index 91f66d68bcb7..135c91c434bf 100644 --- a/drivers/usb/misc/usb251xb.c +++ b/drivers/usb/misc/usb251xb.c | |||
@@ -114,7 +114,6 @@ | |||
114 | 114 | ||
115 | #define DRIVER_NAME "usb251xb" | 115 | #define DRIVER_NAME "usb251xb" |
116 | #define DRIVER_DESC "Microchip USB 2.0 Hi-Speed Hub Controller" | 116 | #define DRIVER_DESC "Microchip USB 2.0 Hi-Speed Hub Controller" |
117 | #define DRIVER_VERSION "1.0" | ||
118 | 117 | ||
119 | struct usb251xb { | 118 | struct usb251xb { |
120 | struct device *dev; | 119 | struct device *dev; |
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index 5947373700a1..8a13b2fcf3e1 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c | |||
@@ -52,10 +52,6 @@ | |||
52 | #include <linux/slab.h> | 52 | #include <linux/slab.h> |
53 | #include <linux/sched/signal.h> | 53 | #include <linux/sched/signal.h> |
54 | 54 | ||
55 | /* | ||
56 | * Version Information | ||
57 | */ | ||
58 | #define DRIVER_VERSION "v0.6" | ||
59 | #define DRIVER_AUTHOR "Thomas M. Sailer, t.sailer@alumni.ethz.ch" | 55 | #define DRIVER_AUTHOR "Thomas M. Sailer, t.sailer@alumni.ethz.ch" |
60 | #define DRIVER_DESC "USB Parport Cable driver for Cables using the Lucent Technologies USS720 Chip" | 56 | #define DRIVER_DESC "USB Parport Cable driver for Cables using the Lucent Technologies USS720 Chip" |
61 | 57 | ||
@@ -816,8 +812,7 @@ static int __init uss720_init(void) | |||
816 | if (retval) | 812 | if (retval) |
817 | goto out; | 813 | goto out; |
818 | 814 | ||
819 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" | 815 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n"); |
820 | DRIVER_DESC "\n"); | ||
821 | printk(KERN_INFO KBUILD_MODNAME ": NOTE: this is a special purpose " | 816 | printk(KERN_INFO KBUILD_MODNAME ": NOTE: this is a special purpose " |
822 | "driver to allow nonstandard\n"); | 817 | "driver to allow nonstandard\n"); |
823 | printk(KERN_INFO KBUILD_MODNAME ": protocols (eg. bitbang) over " | 818 | printk(KERN_INFO KBUILD_MODNAME ": protocols (eg. bitbang) over " |