Commit dba8e1ad authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman

Staging: hv: mousevsc: Address some style issues

Deal with some style related issues. Also get rid of an unused macro.
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f72a1cc7
...@@ -115,7 +115,6 @@ struct synthhid_input_report { ...@@ -115,7 +115,6 @@ struct synthhid_input_report {
#define INPUTVSC_SEND_RING_BUFFER_SIZE (10*PAGE_SIZE) #define INPUTVSC_SEND_RING_BUFFER_SIZE (10*PAGE_SIZE)
#define INPUTVSC_RECV_RING_BUFFER_SIZE (10*PAGE_SIZE) #define INPUTVSC_RECV_RING_BUFFER_SIZE (10*PAGE_SIZE)
#define NBITS(x) (((x)/BITS_PER_LONG)+1)
enum pipe_prot_msg_type { enum pipe_prot_msg_type {
PIPE_MESSAGE_INVALID, PIPE_MESSAGE_INVALID,
...@@ -146,6 +145,7 @@ struct mousevsc_prt_msg { ...@@ -146,6 +145,7 @@ struct mousevsc_prt_msg {
struct mousevsc_dev { struct mousevsc_dev {
struct hv_device *device; struct hv_device *device;
bool init_complete; bool init_complete;
bool connected;
struct mousevsc_prt_msg protocol_req; struct mousevsc_prt_msg protocol_req;
struct mousevsc_prt_msg protocol_resp; struct mousevsc_prt_msg protocol_resp;
/* Synchronize the request/response if needed */ /* Synchronize the request/response if needed */
...@@ -156,7 +156,6 @@ struct mousevsc_dev { ...@@ -156,7 +156,6 @@ struct mousevsc_dev {
unsigned char *report_desc; unsigned char *report_desc;
u32 report_desc_size; u32 report_desc_size;
struct hv_input_dev_info hid_dev_info; struct hv_input_dev_info hid_dev_info;
bool connected;
struct hid_device *hid_device; struct hid_device *hid_device;
}; };
...@@ -359,9 +358,9 @@ static void mousevsc_on_channel_callback(void *context) ...@@ -359,9 +358,9 @@ static void mousevsc_on_channel_callback(void *context)
bufferlen = bytes_recvd; bufferlen = bytes_recvd;
buffer = kmalloc(bytes_recvd, GFP_ATOMIC); buffer = kmalloc(bytes_recvd, GFP_ATOMIC);
if (buffer == NULL) { if (!buffer)
return; return;
}
break; break;
} }
} while (1); } while (1);
...@@ -376,7 +375,6 @@ static int mousevsc_connect_to_vsp(struct hv_device *device) ...@@ -376,7 +375,6 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
struct mousevsc_prt_msg *request; struct mousevsc_prt_msg *request;
struct mousevsc_prt_msg *response; struct mousevsc_prt_msg *response;
request = &input_dev->protocol_req; request = &input_dev->protocol_req;
memset(request, 0, sizeof(struct mousevsc_prt_msg)); memset(request, 0, sizeof(struct mousevsc_prt_msg));
...@@ -388,7 +386,6 @@ static int mousevsc_connect_to_vsp(struct hv_device *device) ...@@ -388,7 +386,6 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
request->request.header.size = sizeof(unsigned int); request->request.header.size = sizeof(unsigned int);
request->request.version_requested.version = SYNTHHID_INPUT_VERSION; request->request.version_requested.version = SYNTHHID_INPUT_VERSION;
ret = vmbus_sendpacket(device->channel, request, ret = vmbus_sendpacket(device->channel, request,
sizeof(struct pipe_prt_msg) - sizeof(struct pipe_prt_msg) -
sizeof(unsigned char) + sizeof(unsigned char) +
...@@ -396,11 +393,11 @@ static int mousevsc_connect_to_vsp(struct hv_device *device) ...@@ -396,11 +393,11 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
(unsigned long)request, (unsigned long)request,
VM_PKT_DATA_INBAND, VM_PKT_DATA_INBAND,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if (ret != 0) if (ret)
goto cleanup; goto cleanup;
t = wait_for_completion_timeout(&input_dev->wait_event, 5*HZ); t = wait_for_completion_timeout(&input_dev->wait_event, 5*HZ);
if (t == 0) { if (!t) {
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto cleanup; goto cleanup;
} }
...@@ -415,7 +412,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device) ...@@ -415,7 +412,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
} }
t = wait_for_completion_timeout(&input_dev->wait_event, 5*HZ); t = wait_for_completion_timeout(&input_dev->wait_event, 5*HZ);
if (t == 0) { if (!t) {
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto cleanup; goto cleanup;
} }
...@@ -487,7 +484,6 @@ static int mousevsc_probe(struct hv_device *device, ...@@ -487,7 +484,6 @@ static int mousevsc_probe(struct hv_device *device,
return ret; return ret;
} }
ret = mousevsc_connect_to_vsp(device); ret = mousevsc_connect_to_vsp(device);
if (ret != 0) if (ret != 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment