From patchwork Thu Jan 5 19:07:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Grundler X-Patchwork-Id: 9499523 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 97C0E60413 for ; Thu, 5 Jan 2017 19:07:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87A1D28356 for ; Thu, 5 Jan 2017 19:07:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C7092843F; Thu, 5 Jan 2017 19:07:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 921FA28446 for ; Thu, 5 Jan 2017 19:07:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968147AbdAETHi (ORCPT ); Thu, 5 Jan 2017 14:07:38 -0500 Received: from mail-pf0-f178.google.com ([209.85.192.178]:32935 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030458AbdAETHM (ORCPT ); Thu, 5 Jan 2017 14:07:12 -0500 Received: by mail-pf0-f178.google.com with SMTP id d2so89068122pfd.0 for ; Thu, 05 Jan 2017 11:07:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=S3h1cVlWbNd5lnNwYYjm76xRPxM8Vj+GgJ+r9QO1B7Q=; b=Qy4gsnwGYVLsWekT+zI/VOv0KXPmQZUwQOuJIb5BwXyGjTZc/e3ljxt98ZonVGqWvT UP5yW+RUiuCopcQkQiuWgebXQfDluLkqRP9HYIE+e8/zRzQyUKU03MtBxht9WJWwiC7N gtIxifxMj3m3Ml3tBD0FOWTcSVbA32FLCJBXk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=S3h1cVlWbNd5lnNwYYjm76xRPxM8Vj+GgJ+r9QO1B7Q=; b=L1eUpAHHlDHm5OxqdGr84y9sJ26GDAiDgvwCOVa0rgnCnvhI1vrZG8oLfzmC0uMqXU fxfoTCgEFCHfJ761j5Ip6I463lugjJ3vmkDuToNgTLhIcYNhKXI5Wh/Yj270pyjE/2Vk dOVZK3nbeOn3xWRLTW5fF96yd0kHmFZjq9qCvRjtN/Q6oQ/NNTyuF/h45H2cJITvIDnm G5/JPLurZRA62v2Rsv5zMgJPJTqG+62J2xWL/D0tMXXqoXOUnLh2WX3S7G2ZOcoSIqcE BkruhCw9isu/0KDg8KBXVGgPL7VoH93qTnAnNAJYTkaJ0+pgAqlxaE7z10moNVpIbEIa gHTA== X-Gm-Message-State: AIkVDXK0ed2hoOFfg6nqBVNQ6BZxFR+uK+gbbvLXOd6yMh1Ru7lU+WUomb69/GeXOkCt841/ X-Received: by 10.84.193.131 with SMTP id f3mr17208927pld.26.1483643231696; Thu, 05 Jan 2017 11:07:11 -0800 (PST) Received: from firesword.mtv.corp.google.com ([172.18.104.33]) by smtp.gmail.com with ESMTPSA id u3sm155191906pfk.3.2017.01.05.11.07.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Jan 2017 11:07:09 -0800 (PST) From: Grant Grundler X-Google-Original-From: Grant Grundler To: Jiri Kosina , Benjamin Tissoires Cc: Dmitry Torokhov , linux-input , linux-kernel , linux-usb , Grant Grundler Subject: [PATCH] HID: remove use of DRIVER_LICENSE Date: Thu, 5 Jan 2017 11:07:04 -0800 Message-Id: <20170105190704.56654-1-grundler@google.com> X-Mailer: git-send-email 2.11.0.390.gc69c2f50cf-goog Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Benjamin Tissoires --- 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 " #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 " #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 " #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");