Commit 6973c6f2 authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman
Browse files

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: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 981f30cc

drivers/staging/usbip/stub_main.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

drivers/staging/usbip/usbip_common.c

+2 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#include "usbip_common.h"



#define DRIVER_VERSION "1.0"

#define DRIVER_AUTHOR "Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>"

#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);

drivers/staging/usbip/usbip_common.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <asm/byteorder.h>

#include <net/sock.h>



#define USBIP_VERSION "1.0.0"



/**

 * usbip_udbg - print debug messages if CONFIG_USB_IP_DEBUG is defined

 * @fmt:

drivers/staging/usbip/vhci_hcd.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE