From 6973c6f24e105f1bdf811ec2320d2de8798145ee Mon Sep 17 00:00:00 2001 From: matt mooney Date: Wed, 11 May 2011 01:54:14 -0700 Subject: [PATCH] staging: usbip: use single version for all modules Having separate versions in this situation makes little sense, so USBIP_VERSION will be used by all modules. Signed-off-by: matt mooney Signed-off-by: Greg Kroah-Hartman --- 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 c139f0e25d85..a3c73b2fd288 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 279cad4dc654..6c44fa4aebef 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 c84bed9a044c..aa5d576abb6b 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 a3e42f841c43..7372d4d0103b 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" @@ -1232,7 +1231,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) @@ -1269,4 +1268,4 @@ module_exit(vhci_cleanup); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); -MODULE_VERSION(DRIVER_VERSION); +MODULE_VERSION(USBIP_VERSION); -- 2.39.2