Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267630
b: refs/heads/master
c: dbbb249
h: refs/heads/master
v: v3
  • Loading branch information
Ruslan Pisarev authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 4b80995 commit 9e9c4f7
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5be528c2130a1281ba858296924dd619068bb0e3
refs/heads/master: dbbb24947e1bea5e6034ae2edfbf1be5b8f2b062
40 changes: 20 additions & 20 deletions trunk/drivers/staging/hv/hv_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct hv_input_dev_info {
(SYNTHHID_INPUT_VERSION_MAJOR << 16))


#pragma pack(push,1)
#pragma pack(push, 1)
/*
* Message types in the synthetic input protocol
*/
Expand Down Expand Up @@ -120,8 +120,8 @@ struct synthhid_input_report {

#pragma pack(pop)

#define INPUTVSC_SEND_RING_BUFFER_SIZE 10*PAGE_SIZE
#define INPUTVSC_RECV_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 NBITS(x) (((x)/BITS_PER_LONG)+1)

Expand Down Expand Up @@ -509,22 +509,22 @@ static void mousevsc_on_channel_callback(void *context)
desc = (struct vmpacket_descriptor *)buffer;

switch (desc->type) {
case VM_PKT_COMP:
mousevsc_on_send_completion(
device, desc);
break;

case VM_PKT_DATA_INBAND:
mousevsc_on_receive(
device, desc);
break;

default:
pr_err("unhandled packet type %d, tid %llx len %d\n",
desc->type,
req_id,
bytes_recvd);
break;
case VM_PKT_COMP:
mousevsc_on_send_completion(
device, desc);
break;

case VM_PKT_DATA_INBAND:
mousevsc_on_receive(
device, desc);
break;

default:
pr_err("unhandled packet type %d, tid %llx len %d\n",
desc->type,
req_id,
bytes_recvd);
break;
}

/* reset */
Expand Down Expand Up @@ -960,7 +960,7 @@ static void __exit mousevsc_exit(void)
* installed and/or configured. We don't do anything else with the table, but
* it needs to be present.
*/
const static struct pci_device_id microsoft_hv_pci_table[] = {
static const struct pci_device_id microsoft_hv_pci_table[] = {
{ PCI_DEVICE(0x1414, 0x5353) }, /* VGA compatible controller */
{ 0 }
};
Expand Down

0 comments on commit 9e9c4f7

Please sign in to comment.