Staging: hv: mousevsc: Cleanup mousevsc_on_channel_callback()

Cleanup mousevsc_on_channel_callback(). This is based on the code provided
by Joe Perches <joe@perches.com>.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan 2011-10-25 17:19:50 -07:00 коммит произвёл Greg Kroah-Hartman
Родитель 32325302aa
Коммит 3b5632efd9
1 изменённых файлов: 34 добавлений и 45 удалений

Просмотреть файл

@ -313,73 +313,62 @@ static void mousevsc_on_receive(struct hv_device *device,
static void mousevsc_on_channel_callback(void *context) static void mousevsc_on_channel_callback(void *context)
{ {
const int packetSize = 0x100; const int packet_size = 0x100;
int ret = 0; int ret;
struct hv_device *device = (struct hv_device *)context; struct hv_device *device = context;
u32 bytes_recvd; u32 bytes_recvd;
u64 req_id; u64 req_id;
unsigned char packet[0x100];
struct vmpacket_descriptor *desc; struct vmpacket_descriptor *desc;
unsigned char *buffer = packet; unsigned char *buffer;
int bufferlen = packetSize; int bufferlen = packet_size;
buffer = kmalloc(bufferlen, GFP_ATOMIC);
if (!buffer)
return;
do { do {
ret = vmbus_recvpacket_raw(device->channel, buffer, ret = vmbus_recvpacket_raw(device->channel, buffer,
bufferlen, &bytes_recvd, &req_id); bufferlen, &bytes_recvd, &req_id);
if (ret == 0) { switch (ret) {
if (bytes_recvd > 0) { case 0:
desc = (struct vmpacket_descriptor *)buffer; if (bytes_recvd <= 0) {
kfree(buffer);
return;
}
desc = (struct vmpacket_descriptor *)buffer;
switch (desc->type) { switch (desc->type) {
case VM_PKT_COMP: case VM_PKT_COMP:
break; break;
case VM_PKT_DATA_INBAND: case VM_PKT_DATA_INBAND:
mousevsc_on_receive( mousevsc_on_receive(device, desc);
device, desc); break;
break;
default: default:
pr_err("unhandled packet type %d, tid %llx len %d\n", pr_err("unhandled packet type %d, tid %llx len %d\n",
desc->type, desc->type,
req_id, req_id,
bytes_recvd); bytes_recvd);
break;
}
/* reset */
if (bufferlen > packetSize) {
kfree(buffer);
buffer = packet;
bufferlen = packetSize;
}
} else {
if (bufferlen > packetSize) {
kfree(buffer);
buffer = packet;
bufferlen = packetSize;
}
break; break;
} }
} else if (ret == -ENOBUFS) {
break;
case -ENOBUFS:
kfree(buffer);
/* Handle large packet */ /* Handle large packet */
bufferlen = bytes_recvd; bufferlen = bytes_recvd;
buffer = kzalloc(bytes_recvd, GFP_ATOMIC); buffer = kmalloc(bytes_recvd, GFP_ATOMIC);
if (buffer == NULL) { if (buffer == NULL) {
buffer = packet; return;
bufferlen = packetSize;
break;
} }
break;
} }
} while (1); } while (1);
return;
} }
static int mousevsc_connect_to_vsp(struct hv_device *device) static int mousevsc_connect_to_vsp(struct hv_device *device)