From patchwork Tue Aug 5 15:08:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 4679571 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B3B289F375 for ; Tue, 5 Aug 2014 15:08:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2F6D2018B for ; Tue, 5 Aug 2014 15:08:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5F2A2011D for ; Tue, 5 Aug 2014 15:08:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755086AbaHEPIe (ORCPT ); Tue, 5 Aug 2014 11:08:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15442 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755077AbaHEPIe (ORCPT ); Tue, 5 Aug 2014 11:08:34 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s75F8DFE003882 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 5 Aug 2014 11:08:13 -0400 Received: from t540p.bos.redhat.com ([10.18.25.63]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s75F8CPJ021458; Tue, 5 Aug 2014 11:08:12 -0400 From: Benjamin Tissoires To: Dmitry Torokhov , Jiri Kosina , Ping Cheng , Jason Gerecke , Przemo Firszt Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH] Input - wacom: only register once the MODULE_* macros Date: Tue, 5 Aug 2014 11:08:12 -0400 Message-Id: <1407251292-10177-1-git-send-email-benjamin.tissoires@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Putting the various MODULE_* makes them appear several times in modinfo because wacom.h is used both in wacom_sys.c and wacom_wac.h. Having the macros near the module declaration makes them appear only once. Add also MODULE_VERSION(DRIVER_VERSION) to export the current version number. Signed-off-by: Benjamin Tissoires --- Dmitry, I guess this one could sneak on top of your pull request too. If not, then I'll push Jiri to take it in one of the future rc :) Cheers, Benjamin drivers/hid/wacom.h | 4 ---- drivers/hid/wacom_sys.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h index 8cc4406..64bc1b2 100644 --- a/drivers/hid/wacom.h +++ b/drivers/hid/wacom.h @@ -101,10 +101,6 @@ #define DRIVER_DESC "USB Wacom tablet driver" #define DRIVER_LICENSE "GPL" -MODULE_AUTHOR(DRIVER_AUTHOR); -MODULE_DESCRIPTION(DRIVER_DESC); -MODULE_LICENSE(DRIVER_LICENSE); - #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 6e0c191..ff4ec50 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -1437,6 +1437,11 @@ static int wacom_reset_resume(struct hid_device *hdev) return wacom_resume(hdev); } +MODULE_VERSION(DRIVER_VERSION); +MODULE_AUTHOR(DRIVER_AUTHOR); +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE(DRIVER_LICENSE); + static struct hid_driver wacom_driver = { .name = "wacom", .id_table = wacom_ids,