diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2012-01-12 12:38:04 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-08 17:07:38 -0800 |
| commit | 85904a5e553f343243e5cf59f150174159e2e5ea (patch) | |
| tree | c9c3bf810690e1e6cc37c5632c090b41fd7cbbe9 | |
| parent | c649114a5d99eb10e58f977f82018b1d77191aa7 (diff) | |
| download | linux-stable-85904a5e553f343243e5cf59f150174159e2e5ea.tar.gz linux-stable-85904a5e553f343243e5cf59f150174159e2e5ea.tar.bz2 linux-stable-85904a5e553f343243e5cf59f150174159e2e5ea.zip | |
Staging: hv: storvsc: Cleanup the code for generating protocol version
Cleanup the code for generating protocol version.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/hv/storvsc_drv.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index da71294bf410..629edd17fd9b 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -61,10 +61,13 @@ MODULE_PARM_DESC(storvsc_ringbuffer_size, "Ring buffer size (bytes)"); * version numbers will be interpreted as "0.x" (i.e., 1 becomes 0.1). */ -#define VMSTOR_PROTOCOL_MAJOR(VERSION_) (((VERSION_) >> 8) & 0xff) -#define VMSTOR_PROTOCOL_MINOR(VERSION_) (((VERSION_)) & 0xff) -#define VMSTOR_PROTOCOL_VERSION(MAJOR_, MINOR_) ((((MAJOR_) & 0xff) << 8) | \ - (((MINOR_) & 0xff))) +static inline u16 storvsc_get_version(u8 major, u8 minor) +{ + u16 version; + + version = ((major << 8) | minor); + return version; +} /* * Version history: @@ -74,9 +77,8 @@ MODULE_PARM_DESC(storvsc_ringbuffer_size, "Ring buffer size (bytes)"); * Win7: 4.2 */ -#define VMSTOR_PROTOCOL_VERSION_CURRENT VMSTOR_PROTOCOL_VERSION(4, 2) - - +#define VMSTOR_CURRENT_MAJOR 4 +#define VMSTOR_CURRENT_MINOR 2 /* @@ -170,7 +172,7 @@ struct vmstorage_channel_properties { /* This structure is sent during the storage protocol negotiations. */ struct vmstorage_protocol_version { /* Major (MSW) and minor (LSW) version numbers. */ - unsigned short major_minor; + u16 major_minor; /* * Revision number is auto-incremented whenever this file is changed @@ -179,7 +181,7 @@ struct vmstorage_protocol_version { * builds. * This is only used on the windows side. Just set it to 0. */ - unsigned short revision; + u16 revision; } __packed; /* Channel Property Flags */ @@ -687,7 +689,12 @@ static int storvsc_channel_init(struct hv_device *device) vstor_packet->operation = VSTOR_OPERATION_QUERY_PROTOCOL_VERSION; vstor_packet->flags = REQUEST_COMPLETION_FLAG; - vstor_packet->version.major_minor = VMSTOR_PROTOCOL_VERSION_CURRENT; + vstor_packet->version.major_minor = + storvsc_get_version(VMSTOR_CURRENT_MAJOR, VMSTOR_CURRENT_MINOR); + + /* + * The revision number is only used in Windows; set it to 0. + */ vstor_packet->version.revision = 0; ret = vmbus_sendpacket(device->channel, vstor_packet, |