Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: hv: Rename camel cased functions in channel.c to lowercase

Rename camel cased functions in channel.c to lowercase

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Haiyang Zhang and committed by
Greg Kroah-Hartman
fff41b2e beb50909

+116 -116
+51 -51
drivers/staging/hv/channel.c
··· 27 27 #include "vmbus_private.h" 28 28 29 29 /* Internal routines */ 30 - static int VmbusChannelCreateGpadlHeader( 30 + static int create_gpadl_header( 31 31 void *kbuffer, /* must be phys and virt contiguous */ 32 32 u32 size, /* page-size multiple */ 33 33 struct vmbus_channel_msginfo **msginfo, 34 34 u32 *messagecount); 35 - static void DumpVmbusChannel(struct vmbus_channel *channel); 36 - static void VmbusChannelSetEvent(struct vmbus_channel *channel); 35 + static void dump_vmbus_channel(struct vmbus_channel *channel); 36 + static void vmbus_setevent(struct vmbus_channel *channel); 37 37 38 38 39 39 #if 0 ··· 67 67 #endif 68 68 69 69 /* 70 - * VmbusChannelSetEvent - Trigger an event notification on the specified 70 + * vmbus_setevent- Trigger an event notification on the specified 71 71 * channel. 72 72 */ 73 - static void VmbusChannelSetEvent(struct vmbus_channel *channel) 73 + static void vmbus_setevent(struct vmbus_channel *channel) 74 74 { 75 75 struct hv_monitor_page *monitorpage; 76 76 ··· 115 115 116 116 #endif 117 117 /* 118 - * VmbusChannelGetDebugInfo -Retrieve various channel debug info 118 + * vmbus_get_debug_info -Retrieve various channel debug info 119 119 */ 120 - void VmbusChannelGetDebugInfo(struct vmbus_channel *channel, 120 + void vmbus_get_debug_info(struct vmbus_channel *channel, 121 121 struct vmbus_channel_debug_info *debuginfo) 122 122 { 123 123 struct hv_monitor_page *monitorpage; ··· 160 160 } 161 161 162 162 /* 163 - * VmbusChannelOpen - Open the specified channel. 163 + * vmbus_open - Open the specified channel. 164 164 */ 165 - int VmbusChannelOpen(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, 165 + int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, 166 166 u32 recv_ringbuffer_size, void *userdata, u32 userdatalen, 167 167 void (*onchannelcallback)(void *context), void *context) 168 168 { ··· 212 212 213 213 newchannel->RingBufferGpadlHandle = 0; 214 214 215 - ret = VmbusChannelEstablishGpadl(newchannel, 215 + ret = vmbus_establish_gpadl(newchannel, 216 216 newchannel->Outbound.RingBuffer, 217 217 send_ringbuffer_size + 218 218 recv_ringbuffer_size, ··· 307 307 } 308 308 309 309 /* 310 - * DumpGpadlBody - Dump the gpadl body message to the console for 310 + * dump_gpadl_body - Dump the gpadl body message to the console for 311 311 * debugging purposes. 312 312 */ 313 - static void DumpGpadlBody(struct vmbus_channel_gpadl_body *gpadl, u32 len) 313 + static void dump_gpadl_body(struct vmbus_channel_gpadl_body *gpadl, u32 len) 314 314 { 315 315 int i; 316 316 int pfncount; ··· 325 325 } 326 326 327 327 /* 328 - * DumpGpadlHeader - Dump the gpadl header message to the console for 328 + * dump_gpadl_header - Dump the gpadl header message to the console for 329 329 * debugging purposes. 330 330 */ 331 - static void DumpGpadlHeader(struct vmbus_channel_gpadl_header *gpadl) 331 + static void dump_gpadl_header(struct vmbus_channel_gpadl_header *gpadl) 332 332 { 333 333 int i, j; 334 334 int pagecount; ··· 351 351 } 352 352 353 353 /* 354 - * VmbusChannelCreateGpadlHeader - Creates a gpadl for the specified buffer 354 + * create_gpadl_header - Creates a gpadl for the specified buffer 355 355 */ 356 - static int VmbusChannelCreateGpadlHeader(void *kbuffer, u32 size, 356 + static int create_gpadl_header(void *kbuffer, u32 size, 357 357 struct vmbus_channel_msginfo **msginfo, 358 358 u32 *messagecount) 359 359 { ··· 479 479 } 480 480 481 481 /* 482 - * VmbusChannelEstablishGpadl - Estabish a GPADL for the specified buffer 482 + * vmbus_establish_gpadl - Estabish a GPADL for the specified buffer 483 483 * 484 484 * @channel: a channel 485 485 * @kbuffer: from kmalloc 486 486 * @size: page-size multiple 487 487 * @gpadl_handle: some funky thing 488 488 */ 489 - int VmbusChannelEstablishGpadl(struct vmbus_channel *channel, void *kbuffer, 489 + int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, 490 490 u32 size, u32 *gpadl_handle) 491 491 { 492 492 struct vmbus_channel_gpadl_header *gpadlmsg; ··· 503 503 next_gpadl_handle = atomic_read(&gVmbusConnection.NextGpadlHandle); 504 504 atomic_inc(&gVmbusConnection.NextGpadlHandle); 505 505 506 - ret = VmbusChannelCreateGpadlHeader(kbuffer, size, &msginfo, &msgcount); 506 + ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount); 507 507 if (ret) 508 508 return ret; 509 509 ··· 518 518 gpadlmsg->ChildRelId = channel->OfferMsg.ChildRelId; 519 519 gpadlmsg->Gpadl = next_gpadl_handle; 520 520 521 - DumpGpadlHeader(gpadlmsg); 521 + dump_gpadl_header(gpadlmsg); 522 522 523 523 spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags); 524 524 list_add_tail(&msginfo->MsgListEntry, ··· 554 554 submsginfo->MessageSize - 555 555 sizeof(*submsginfo)); 556 556 557 - DumpGpadlBody(gpadl_body, submsginfo->MessageSize - 557 + dump_gpadl_body(gpadl_body, submsginfo->MessageSize - 558 558 sizeof(*submsginfo)); 559 559 ret = VmbusPostMessage(gpadl_body, 560 560 submsginfo->MessageSize - ··· 586 586 } 587 587 588 588 /* 589 - * VmbusChannelTeardownGpadl -Teardown the specified GPADL handle 589 + * vmbus_teardown_gpadl -Teardown the specified GPADL handle 590 590 */ 591 - int VmbusChannelTeardownGpadl(struct vmbus_channel *channel, u32 gpadl_handle) 591 + int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle) 592 592 { 593 593 struct vmbus_channel_gpadl_teardown *msg; 594 594 struct vmbus_channel_msginfo *info; ··· 639 639 } 640 640 641 641 /* 642 - * VmbusChannelClose - Close the specified channel 642 + * vmbus_close - Close the specified channel 643 643 */ 644 - void VmbusChannelClose(struct vmbus_channel *channel) 644 + void vmbus_close(struct vmbus_channel *channel) 645 645 { 646 646 struct vmbus_channel_close_channel *msg; 647 647 struct vmbus_channel_msginfo *info; ··· 674 674 675 675 /* Tear down the gpadl for the channel's ring buffer */ 676 676 if (channel->RingBufferGpadlHandle) 677 - VmbusChannelTeardownGpadl(channel, 677 + vmbus_teardown_gpadl(channel, 678 678 channel->RingBufferGpadlHandle); 679 679 680 680 /* TODO: Send a msg to release the childRelId */ ··· 703 703 } 704 704 705 705 /** 706 - * VmbusChannelSendPacket() - Send the specified buffer on the given channel 706 + * vmbus_sendpacket() - Send the specified buffer on the given channel 707 707 * @channel: Pointer to vmbus_channel structure. 708 708 * @buffer: Pointer to the buffer you want to receive the data into. 709 709 * @bufferlen: Maximum size of what the the buffer will hold ··· 716 716 * 717 717 * Mainly used by Hyper-V drivers. 718 718 */ 719 - int VmbusChannelSendPacket(struct vmbus_channel *channel, const void *buffer, 719 + int vmbus_sendpacket(struct vmbus_channel *channel, const void *buffer, 720 720 u32 bufferlen, u64 requestid, 721 721 enum vmbus_packet_type type, u32 flags) 722 722 { ··· 730 730 DPRINT_DBG(VMBUS, "channel %p buffer %p len %d", 731 731 channel, buffer, bufferlen); 732 732 733 - DumpVmbusChannel(channel); 733 + dump_vmbus_channel(channel); 734 734 735 735 /* ASSERT((packetLenAligned - packetLen) < sizeof(u64)); */ 736 736 ··· 752 752 753 753 /* TODO: We should determine if this is optional */ 754 754 if (ret == 0 && !GetRingBufferInterruptMask(&channel->Outbound)) 755 - VmbusChannelSetEvent(channel); 755 + vmbus_setevent(channel); 756 756 757 757 return ret; 758 758 } 759 - EXPORT_SYMBOL(VmbusChannelSendPacket); 759 + EXPORT_SYMBOL(vmbus_sendpacket); 760 760 761 761 /* 762 - * VmbusChannelSendPacketPageBuffer - Send a range of single-page buffer 762 + * vmbus_sendpacket_pagebuffer - Send a range of single-page buffer 763 763 * packets using a GPADL Direct packet type. 764 764 */ 765 - int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *channel, 765 + int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, 766 766 struct hv_page_buffer pagebuffers[], 767 767 u32 pagecount, void *buffer, u32 bufferlen, 768 768 u64 requestid) ··· 779 779 if (pagecount > MAX_PAGE_BUFFER_COUNT) 780 780 return -EINVAL; 781 781 782 - DumpVmbusChannel(channel); 782 + dump_vmbus_channel(channel); 783 783 784 784 /* 785 785 * Adjust the size down since vmbus_channel_packet_page_buffer is the ··· 817 817 818 818 /* TODO: We should determine if this is optional */ 819 819 if (ret == 0 && !GetRingBufferInterruptMask(&channel->Outbound)) 820 - VmbusChannelSetEvent(channel); 820 + vmbus_setevent(channel); 821 821 822 822 return ret; 823 823 } 824 824 825 825 /* 826 - * VmbusChannelSendPacketMultiPageBuffer - Send a multi-page buffer packet 826 + * vmbus_sendpacket_multipagebuffer - Send a multi-page buffer packet 827 827 * using a GPADL Direct packet type. 828 828 */ 829 - int VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *channel, 829 + int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel, 830 830 struct hv_multipage_buffer *multi_pagebuffer, 831 831 void *buffer, u32 bufferlen, u64 requestid) 832 832 { ··· 840 840 u32 pfncount = NUM_PAGES_SPANNED(multi_pagebuffer->Offset, 841 841 multi_pagebuffer->Length); 842 842 843 - DumpVmbusChannel(channel); 843 + dump_vmbus_channel(channel); 844 844 845 845 DPRINT_DBG(VMBUS, "data buffer - offset %u len %u pfn count %u", 846 846 multi_pagebuffer->Offset, ··· 885 885 886 886 /* TODO: We should determine if this is optional */ 887 887 if (ret == 0 && !GetRingBufferInterruptMask(&channel->Outbound)) 888 - VmbusChannelSetEvent(channel); 888 + vmbus_setevent(channel); 889 889 890 890 return ret; 891 891 } 892 892 893 893 894 894 /** 895 - * VmbusChannelRecvPacket() - Retrieve the user packet on the specified channel 895 + * vmbus_recvpacket() - Retrieve the user packet on the specified channel 896 896 * @channel: Pointer to vmbus_channel structure. 897 897 * @buffer: Pointer to the buffer you want to receive the data into. 898 898 * @bufferlen: Maximum size of what the the buffer will hold ··· 904 904 * 905 905 * Mainly used by Hyper-V drivers. 906 906 */ 907 - int VmbusChannelRecvPacket(struct vmbus_channel *channel, void *buffer, 907 + int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer, 908 908 u32 bufferlen, u32 *buffer_actual_len, u64 *requestid) 909 909 { 910 910 struct vmpacket_descriptor desc; ··· 958 958 959 959 return 0; 960 960 } 961 - EXPORT_SYMBOL(VmbusChannelRecvPacket); 961 + EXPORT_SYMBOL(vmbus_recvpacket); 962 962 963 963 /* 964 - * VmbusChannelRecvPacketRaw - Retrieve the raw packet on the specified channel 964 + * vmbus_recvpacket_raw - Retrieve the raw packet on the specified channel 965 965 */ 966 - int VmbusChannelRecvPacketRaw(struct vmbus_channel *channel, void *buffer, 966 + int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer, 967 967 u32 bufferlen, u32 *buffer_actual_len, 968 968 u64 *requestid) 969 969 { ··· 1017 1017 } 1018 1018 1019 1019 /* 1020 - * VmbusChannelOnChannelEvent - Channel event callback 1020 + * vmbus_onchannel_event - Channel event callback 1021 1021 */ 1022 - void VmbusChannelOnChannelEvent(struct vmbus_channel *channel) 1022 + void vmbus_onchannel_event(struct vmbus_channel *channel) 1023 1023 { 1024 - DumpVmbusChannel(channel); 1024 + dump_vmbus_channel(channel); 1025 1025 /* ASSERT(Channel->OnChannelCallback); */ 1026 1026 1027 1027 channel->OnChannelCallback(channel->ChannelCallbackContext); ··· 1030 1030 } 1031 1031 1032 1032 /* 1033 - * VmbusChannelOnTimer - Timer event callback 1033 + * vmbus_ontimer - Timer event callback 1034 1034 */ 1035 - void VmbusChannelOnTimer(unsigned long data) 1035 + void vmbus_ontimer(unsigned long data) 1036 1036 { 1037 1037 struct vmbus_channel *channel = (struct vmbus_channel *)data; 1038 1038 ··· 1041 1041 } 1042 1042 1043 1043 /* 1044 - * DumpVmbusChannel - Dump vmbus channel info to the console 1044 + * dump_vmbus_channel- Dump vmbus channel info to the console 1045 1045 */ 1046 - static void DumpVmbusChannel(struct vmbus_channel *channel) 1046 + static void dump_vmbus_channel(struct vmbus_channel *channel) 1047 1047 { 1048 1048 DPRINT_DBG(VMBUS, "Channel (%d)", channel->OfferMsg.ChildRelId); 1049 1049 DumpRingInfo(&channel->Outbound, "Outbound ");
+43 -43
drivers/staging/hv/channel.h
··· 52 52 } __attribute__((packed)); 53 53 54 54 55 - extern int VmbusChannelOpen(struct vmbus_channel *channel, 56 - u32 SendRingBufferSize, 57 - u32 RecvRingBufferSize, 58 - void *UserData, 59 - u32 UserDataLen, 60 - void(*OnChannelCallback)(void *context), 61 - void *Context); 55 + extern int vmbus_open(struct vmbus_channel *channel, 56 + u32 send_ringbuffersize, 57 + u32 recv_ringbuffersize, 58 + void *userdata, 59 + u32 userdatalen, 60 + void(*onchannel_callback)(void *context), 61 + void *context); 62 62 63 - extern void VmbusChannelClose(struct vmbus_channel *channel); 63 + extern void vmbus_close(struct vmbus_channel *channel); 64 64 65 - extern int VmbusChannelSendPacket(struct vmbus_channel *channel, 66 - const void *Buffer, 67 - u32 BufferLen, 68 - u64 RequestId, 69 - enum vmbus_packet_type Type, 70 - u32 Flags); 65 + extern int vmbus_sendpacket(struct vmbus_channel *channel, 66 + const void *buffer, 67 + u32 bufferLen, 68 + u64 requestid, 69 + enum vmbus_packet_type type, 70 + u32 flags); 71 71 72 - extern int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *channel, 73 - struct hv_page_buffer PageBuffers[], 74 - u32 PageCount, 75 - void *Buffer, 76 - u32 BufferLen, 77 - u64 RequestId); 72 + extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, 73 + struct hv_page_buffer pagebuffers[], 74 + u32 pagecount, 75 + void *buffer, 76 + u32 bufferlen, 77 + u64 requestid); 78 78 79 - extern int VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *channel, 79 + extern int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel, 80 80 struct hv_multipage_buffer *mpb, 81 - void *Buffer, 82 - u32 BufferLen, 83 - u64 RequestId); 81 + void *buffer, 82 + u32 bufferlen, 83 + u64 requestid); 84 84 85 - extern int VmbusChannelEstablishGpadl(struct vmbus_channel *channel, 86 - void *Kbuffer, 87 - u32 Size, 88 - u32 *GpadlHandle); 85 + extern int vmbus_establish_gpadl(struct vmbus_channel *channel, 86 + void *kbuffer, 87 + u32 size, 88 + u32 *gpadl_handle); 89 89 90 - extern int VmbusChannelTeardownGpadl(struct vmbus_channel *channel, 91 - u32 GpadlHandle); 90 + extern int vmbus_teardown_gpadl(struct vmbus_channel *channel, 91 + u32 gpadl_handle); 92 92 93 - extern int VmbusChannelRecvPacket(struct vmbus_channel *channel, 94 - void *Buffer, 95 - u32 BufferLen, 96 - u32 *BufferActualLen, 97 - u64 *RequestId); 93 + extern int vmbus_recvpacket(struct vmbus_channel *channel, 94 + void *buffer, 95 + u32 bufferlen, 96 + u32 *buffer_actual_len, 97 + u64 *requestid); 98 98 99 - extern int VmbusChannelRecvPacketRaw(struct vmbus_channel *channel, 100 - void *Buffer, 101 - u32 BufferLen, 102 - u32 *BufferActualLen, 103 - u64 *RequestId); 99 + extern int vmbus_recvpacket_raw(struct vmbus_channel *channel, 100 + void *buffer, 101 + u32 bufferlen, 102 + u32 *buffer_actual_len, 103 + u64 *requestid); 104 104 105 - extern void VmbusChannelOnChannelEvent(struct vmbus_channel *channel); 105 + extern void vmbus_onchannel_event(struct vmbus_channel *channel); 106 106 107 - extern void VmbusChannelGetDebugInfo(struct vmbus_channel *channel, 107 + extern void vmbus_get_debug_info(struct vmbus_channel *channel, 108 108 struct vmbus_channel_debug_info *debug); 109 109 110 - extern void VmbusChannelOnTimer(unsigned long data); 110 + extern void vmbus_ontimer(unsigned long data); 111 111 112 112 #endif /* _CHANNEL_H_ */
+10 -10
drivers/staging/hv/channel_interface.c
··· 31 31 void (*ChannelCallback)(void *context), 32 32 void *Context) 33 33 { 34 - return VmbusChannelOpen(device->context, SendBufferSize, 34 + return vmbus_open(device->context, SendBufferSize, 35 35 RecvRingBufferSize, UserData, UserDataLen, 36 36 ChannelCallback, Context); 37 37 } 38 38 39 39 static void IVmbusChannelClose(struct hv_device *device) 40 40 { 41 - VmbusChannelClose(device->context); 41 + vmbus_close(device->context); 42 42 } 43 43 44 44 static int IVmbusChannelSendPacket(struct hv_device *device, const void *Buffer, 45 45 u32 BufferLen, u64 RequestId, u32 Type, 46 46 u32 Flags) 47 47 { 48 - return VmbusChannelSendPacket(device->context, Buffer, BufferLen, 48 + return vmbus_sendpacket(device->context, Buffer, BufferLen, 49 49 RequestId, Type, Flags); 50 50 } 51 51 ··· 54 54 u32 PageCount, void *Buffer, 55 55 u32 BufferLen, u64 RequestId) 56 56 { 57 - return VmbusChannelSendPacketPageBuffer(device->context, PageBuffers, 57 + return vmbus_sendpacket_pagebuffer(device->context, PageBuffers, 58 58 PageCount, Buffer, BufferLen, 59 59 RequestId); 60 60 } ··· 63 63 struct hv_multipage_buffer *MultiPageBuffer, 64 64 void *Buffer, u32 BufferLen, u64 RequestId) 65 65 { 66 - return VmbusChannelSendPacketMultiPageBuffer(device->context, 66 + return vmbus_sendpacket_multipagebuffer(device->context, 67 67 MultiPageBuffer, Buffer, 68 68 BufferLen, RequestId); 69 69 } ··· 72 72 u32 BufferLen, u32 *BufferActualLen, 73 73 u64 *RequestId) 74 74 { 75 - return VmbusChannelRecvPacket(device->context, Buffer, BufferLen, 75 + return vmbus_recvpacket(device->context, Buffer, BufferLen, 76 76 BufferActualLen, RequestId); 77 77 } 78 78 ··· 80 80 u32 BufferLen, u32 *BufferActualLen, 81 81 u64 *RequestId) 82 82 { 83 - return VmbusChannelRecvPacketRaw(device->context, Buffer, BufferLen, 83 + return vmbus_recvpacket_raw(device->context, Buffer, BufferLen, 84 84 BufferActualLen, RequestId); 85 85 } 86 86 87 87 static int IVmbusChannelEstablishGpadl(struct hv_device *device, void *Buffer, 88 88 u32 BufferLen, u32 *GpadlHandle) 89 89 { 90 - return VmbusChannelEstablishGpadl(device->context, Buffer, BufferLen, 90 + return vmbus_establish_gpadl(device->context, Buffer, BufferLen, 91 91 GpadlHandle); 92 92 } 93 93 94 94 static int IVmbusChannelTeardownGpadl(struct hv_device *device, u32 GpadlHandle) 95 95 { 96 - return VmbusChannelTeardownGpadl(device->context, GpadlHandle); 96 + return vmbus_teardown_gpadl(device->context, GpadlHandle); 97 97 98 98 } 99 99 ··· 105 105 if (!device->context) 106 106 return; 107 107 108 - VmbusChannelGetDebugInfo(device->context, &debugInfo); 108 + vmbus_get_debug_info(device->context, &debugInfo); 109 109 110 110 info->ChannelId = debugInfo.RelId; 111 111 info->ChannelState = debugInfo.State;
+4 -4
drivers/staging/hv/channel_mgmt.c
··· 172 172 buflen = PAGE_SIZE; 173 173 buf = kmalloc(buflen, GFP_ATOMIC); 174 174 175 - VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid); 175 + vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid); 176 176 177 177 if (recvlen > 0) { 178 178 icmsghdrp = (struct icmsg_hdr *)&buf[ ··· 183 183 icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION 184 184 | ICMSGHDRFLAG_RESPONSE; 185 185 186 - VmbusChannelSendPacket(channel, buf, 186 + vmbus_sendpacket(channel, buf, 187 187 recvlen, requestid, 188 188 VmbusPacketTypeDataInBand, 0); 189 189 } ··· 249 249 250 250 init_timer(&channel->poll_timer); 251 251 channel->poll_timer.data = (unsigned long)channel; 252 - channel->poll_timer.function = VmbusChannelOnTimer; 252 + channel->poll_timer.function = vmbus_ontimer; 253 253 254 254 channel->ControlWQ = create_workqueue("hv_vmbus_ctl"); 255 255 if (!channel->ControlWQ) { ··· 392 392 if (memcmp(&newChannel->OfferMsg.Offer.InterfaceType, 393 393 &hv_cb_utils[cnt].data, 394 394 sizeof(struct hv_guid)) == 0 && 395 - VmbusChannelOpen(newChannel, 2 * PAGE_SIZE, 395 + vmbus_open(newChannel, 2 * PAGE_SIZE, 396 396 2 * PAGE_SIZE, NULL, 0, 397 397 hv_cb_utils[cnt].callback, 398 398 newChannel) == 0) {
+2 -2
drivers/staging/hv/connection.c
··· 254 254 channel = GetChannelFromRelId(relId); 255 255 256 256 if (channel) { 257 - VmbusChannelOnChannelEvent(channel); 257 + vmbus_onchannel_event(channel); 258 258 /* 259 259 * WorkQueueQueueWorkItem(channel->dataWorkQueue, 260 - * VmbusChannelOnChannelEvent, 260 + * vmbus_onchannel_event, 261 261 * (void*)channel); 262 262 */ 263 263 } else {
+6 -6
drivers/staging/hv/hv_utils.c
··· 55 55 buflen = PAGE_SIZE; 56 56 buf = kmalloc(buflen, GFP_ATOMIC); 57 57 58 - VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid); 58 + vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid); 59 59 60 60 if (recvlen > 0) { 61 61 DPRINT_DBG(VMBUS, "shutdown packet: len=%d, requestid=%lld", ··· 93 93 icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION 94 94 | ICMSGHDRFLAG_RESPONSE; 95 95 96 - VmbusChannelSendPacket(channel, buf, 96 + vmbus_sendpacket(channel, buf, 97 97 recvlen, requestid, 98 98 VmbusPacketTypeDataInBand, 0); 99 99 } ··· 159 159 buflen = PAGE_SIZE; 160 160 buf = kmalloc(buflen, GFP_ATOMIC); 161 161 162 - VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid); 162 + vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid); 163 163 164 164 if (recvlen > 0) { 165 165 DPRINT_DBG(VMBUS, "timesync packet: recvlen=%d, requestid=%lld", ··· 180 180 icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION 181 181 | ICMSGHDRFLAG_RESPONSE; 182 182 183 - VmbusChannelSendPacket(channel, buf, 183 + vmbus_sendpacket(channel, buf, 184 184 recvlen, requestid, 185 185 VmbusPacketTypeDataInBand, 0); 186 186 } ··· 205 205 buflen = PAGE_SIZE; 206 206 buf = kmalloc(buflen, GFP_ATOMIC); 207 207 208 - VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid); 208 + vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid); 209 209 210 210 if (recvlen > 0) { 211 211 DPRINT_DBG(VMBUS, "heartbeat packet: len=%d, requestid=%lld", ··· 233 233 icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION 234 234 | ICMSGHDRFLAG_RESPONSE; 235 235 236 - VmbusChannelSendPacket(channel, buf, 236 + vmbus_sendpacket(channel, buf, 237 237 recvlen, requestid, 238 238 VmbusPacketTypeDataInBand, 0); 239 239 }