Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756149Ab1EKP4C (ORCPT ); Wed, 11 May 2011 11:56:02 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:44265 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755436Ab1EKPz5 (ORCPT ); Wed, 11 May 2011 11:55:57 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=wWGRr9FEnnrQae5qn3hFKVw3s4x2n2LhjUp2YMMSOQLmBG7OVkFIuYNTeOEGJtGQHG v3MzFP+JfIM9kyMZ/H3mak7CVqgkN6OZeS0BDyI9qtt1eYxeoI71Zkt07N8+z32F4hg+ G9pPZspVawcHx34yDRWgMk/cWl/phkSCK5UiQ= From: matt mooney To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 02/12] staging: usbip: use single version for all modules Date: Wed, 11 May 2011 01:54:14 -0700 Message-Id: <0795ecfdf15daf7fe2e7b9c158888eb758153a78.1305103212.git.mfm@muteddisk.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3673 Lines: 113 Having separate versions in this situation makes little sense, so USBIP_VERSION will be used by all modules. Signed-off-by: matt mooney --- drivers/staging/usbip/stub_main.c | 5 ++--- drivers/staging/usbip/usbip_common.c | 5 ++--- drivers/staging/usbip/usbip_common.h | 2 ++ drivers/staging/usbip/vhci_hcd.c | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c index c139f0e..a3c73b2 100644 --- a/drivers/staging/usbip/stub_main.c +++ b/drivers/staging/usbip/stub_main.c @@ -22,7 +22,6 @@ #include "usbip_common.h" #include "stub.h" -#define DRIVER_VERSION "1.0" #define DRIVER_AUTHOR "Takahiro Hirofuchi" #define DRIVER_DESC "Stub Driver for USB/IP" @@ -278,7 +277,7 @@ static int __init usb_stub_init(void) goto error_usb_register; } - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " " DRIVER_VERSION + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " " USBIP_VERSION "\n"); init_busid_table(); @@ -319,4 +318,4 @@ module_exit(usb_stub_exit); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); -MODULE_VERSION(DRIVER_VERSION); +MODULE_VERSION(USBIP_VERSION); diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index 279cad4..6c44fa4 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c @@ -26,7 +26,6 @@ #include "usbip_common.h" -#define DRIVER_VERSION "1.0" #define DRIVER_AUTHOR "Takahiro Hirofuchi " #define DRIVER_DESC "USB/IP Common Driver" @@ -861,7 +860,7 @@ EXPORT_SYMBOL_GPL(usbip_recv_xbuff); static int __init usbip_common_init(void) { - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " " DRIVER_VERSION + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " " USBIP_VERSION "\n"); return 0; } @@ -877,4 +876,4 @@ module_exit(usbip_common_exit); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); -MODULE_VERSION(DRIVER_VERSION); +MODULE_VERSION(USBIP_VERSION); diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h index c84bed9..aa5d576 100644 --- a/drivers/staging/usbip/usbip_common.h +++ b/drivers/staging/usbip/usbip_common.h @@ -26,6 +26,8 @@ #include #include +#define USBIP_VERSION "1.0.0" + /** * usbip_udbg - print debug messages if CONFIG_USB_IP_DEBUG is defined * @fmt: diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index 5a07431..bfb0b5f 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c @@ -23,7 +23,6 @@ #include "usbip_common.h" #include "vhci.h" -#define DRIVER_VERSION "1.0" #define DRIVER_AUTHOR "Takahiro Hirofuchi" #define DRIVER_DESC "Virtual Host Controller Interface Driver for USB/IP" @@ -1231,7 +1230,7 @@ static int __init vhci_init(void) return -ENODEV; printk(KERN_INFO KBUILD_MODNAME ": %s, %s\n", driver_name, - DRIVER_VERSION); + USBIP_VERSION); ret = platform_driver_register(&vhci_driver); if (ret < 0) @@ -1268,4 +1267,4 @@ module_exit(vhci_cleanup); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); -MODULE_VERSION(DRIVER_VERSION); +MODULE_VERSION(USBIP_VERSION); -- 1.7.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/