Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1552235 > unrolled thread
| Started by | Grant Grundler <grundler@chromium.org> |
|---|---|
| First post | 2017-01-05 20:10 +0100 |
| Last post | 2017-01-06 14:40 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] HID: remove use of DRIVER_LICENSE Grant Grundler <grundler@chromium.org> - 2017-01-05 20:10 +0100
Re: [PATCH] HID: remove use of DRIVER_LICENSE Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2017-01-06 09:10 +0100
Re: [PATCH] HID: remove use of DRIVER_LICENSE Jiri Kosina <jikos@kernel.org> - 2017-01-06 14:40 +0100
| From | Grant Grundler <grundler@chromium.org> |
|---|---|
| Date | 2017-01-05 20:10 +0100 |
| Subject | [PATCH] HID: remove use of DRIVER_LICENSE |
| Message-ID | <sWlAe-791-5@gated-at.bofh.it> |
Local "#define DRIVER_LICENSE" obfuscates which license is used
in MODULE_LICENSE(). "fgrep -R MODULE_LICENSE" is more informative
when the string is hard coded in MODULE_LICENSE.
Signed-off-by: Grant Grundler <grundler@google.com>
---
Most of the kernel already uses hard coded strings.
The few places that don't are easy to fix.
drivers/hid/hid-core.c | 3 +--
drivers/hid/usbhid/hid-core.c | 3 +--
drivers/hid/usbhid/usbkbd.c | 3 +--
drivers/hid/usbhid/usbmouse.c | 3 +--
drivers/hid/wacom.h | 1 -
drivers/hid/wacom_sys.c | 2 +-
6 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 08f53c7fd513..996b45dff76d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -43,7 +43,6 @@
*/
#define DRIVER_DESC "HID core driver"
-#define DRIVER_LICENSE "GPL"
int hid_debug = 0;
module_param_named(debug, hid_debug, int, 0600);
@@ -2848,5 +2847,5 @@ module_exit(hid_exit);
MODULE_AUTHOR("Andreas Gal");
MODULE_AUTHOR("Vojtech Pavlik");
MODULE_AUTHOR("Jiri Kosina");
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index ae83af649a60..1847f64ac7dc 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -43,7 +43,6 @@
*/
#define DRIVER_DESC "USB HID core driver"
-#define DRIVER_LICENSE "GPL"
/*
* Module parameters.
@@ -1660,4 +1659,4 @@ MODULE_AUTHOR("Andreas Gal");
MODULE_AUTHOR("Vojtech Pavlik");
MODULE_AUTHOR("Jiri Kosina");
MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index 9a332e683db7..7fb2d1e4f5dd 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -39,11 +39,10 @@
#define DRIVER_VERSION ""
#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
#define DRIVER_DESC "USB HID Boot Protocol keyboard driver"
-#define DRIVER_LICENSE "GPL"
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
static const unsigned char usb_kbd_keycode[256] = {
0, 0, 0, 0, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38,
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index bf16d72dc370..dd911c5241d8 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -42,11 +42,10 @@
#define DRIVER_VERSION "v1.6"
#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
#define DRIVER_DESC "USB HID Boot Protocol mouse driver"
-#define DRIVER_LICENSE "GPL"
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
struct usb_mouse {
char name[128];
diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h
index 4681a65a4579..eb24bf823252 100644
--- a/drivers/hid/wacom.h
+++ b/drivers/hid/wacom.h
@@ -100,7 +100,6 @@
#define DRIVER_VERSION "v2.00"
#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
#define DRIVER_DESC "USB Wacom tablet driver"
-#define DRIVER_LICENSE "GPL"
#define USB_VENDOR_ID_WACOM 0x056a
#define USB_VENDOR_ID_LENOVO 0x17ef
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 499cc8213cfe..f79627df9597 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1959,4 +1959,4 @@ module_hid_driver(wacom_driver);
MODULE_VERSION(DRIVER_VERSION);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
--
2.11.0.390.gc69c2f50cf-goog
[toc] | [next] | [standalone]
| From | Benjamin Tissoires <benjamin.tissoires@redhat.com> |
|---|---|
| Date | 2017-01-06 09:10 +0100 |
| Message-ID | <sWxL3-7g8-11@gated-at.bofh.it> |
| In reply to | #1552235 |
On Jan 05 2017 or thereabouts, Grant Grundler wrote: > Local "#define DRIVER_LICENSE" obfuscates which license is used > in MODULE_LICENSE(). "fgrep -R MODULE_LICENSE" is more informative > when the string is hard coded in MODULE_LICENSE. > > Signed-off-by: Grant Grundler <grundler@google.com> > --- > Most of the kernel already uses hard coded strings. > The few places that don't are easy to fix. FWIW: Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
[toc] | [prev] | [next] | [standalone]
| From | Jiri Kosina <jikos@kernel.org> |
|---|---|
| Date | 2017-01-06 14:40 +0100 |
| Message-ID | <sWCUq-2A2-33@gated-at.bofh.it> |
| In reply to | #1552235 |
On Thu, 5 Jan 2017, Grant Grundler wrote: > Local "#define DRIVER_LICENSE" obfuscates which license is used > in MODULE_LICENSE(). "fgrep -R MODULE_LICENSE" is more informative > when the string is hard coded in MODULE_LICENSE. Applied to hid.git#for-4.11/upstream. Thanks, -- Jiri Kosina SUSE Labs
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web