Staging: hv: cleanup coding style issues in VmbusPrivate.h (f346fdc2) · Commits · jan.koester / Linux

drivers/staging/hv/Connection.c

+6 −21

Original line number	Diff line number	Diff line
		@@ -44,8 +44,7 @@ struct VMBUS_CONNECTION gVmbusConnection = {
		Sends a connect request on the partition service connection

		--*/
		static int
		VmbusConnect(void)
		int VmbusConnect(void)
		{
		int ret=0;
		VMBUS_CHANNEL_MSGINFO *msgInfo=NULL;
		@@ -203,10 +202,7 @@ VmbusConnect(void)
		Sends a disconnect request on the partition service connection

		--*/
		static int
		VmbusDisconnect(
		void
		)
		int VmbusDisconnect(void)
		{
		int ret=0;
		VMBUS_CHANNEL_UNLOAD *msg;
		@@ -259,10 +255,7 @@ VmbusDisconnect(
		Get the channel object given its child relative id (ie channel id)

		--*/
		static VMBUS_CHANNEL*
		GetChannelFromRelId(
		u32 relId
		)
		VMBUS_CHANNEL *GetChannelFromRelId(u32 relId)
		{
		VMBUS_CHANNEL* channel;
		VMBUS_CHANNEL* foundChannel=NULL;
		@@ -334,10 +327,7 @@ VmbusProcessChannelEvent(
		Handler for events

		--*/
		static void
		VmbusOnEvents(
		void
		)
		void VmbusOnEvents(void)
		{
		int dword;
		/* int maxdword = PAGE_SIZE >> 3; // receive size is 1/2 page and divide that by 4 bytes */
		@@ -394,11 +384,7 @@ VmbusOnEvents(
		Send a msg on the vmbus's message connection

		--*/
		static int
		VmbusPostMessage(
		void * buffer,
		size_t bufferLen
		)
		int VmbusPostMessage(void *buffer, size_t bufferLen)
		{
		int ret=0;
		HV_CONNECTION_ID connId;
		@@ -424,8 +410,7 @@ VmbusPostMessage(
		Send an event notification to the parent

		--*/
		static int
		VmbusSetEvent(u32 childRelId)
		int VmbusSetEvent(u32 childRelId)
		{
		int ret=0;

drivers/staging/hv/Vmbus.c

+5 −11

Original line number	Diff line number	Diff line
		@@ -224,9 +224,7 @@ VmbusGetChannelInfo(

		--*/

		static struct hv_device*
		VmbusChildDeviceCreate(
		GUID DeviceType,
		struct hv_device *VmbusChildDeviceCreate(GUID DeviceType,
		GUID DeviceInstance,
		void *Context)
		{
		@@ -248,9 +246,7 @@ VmbusChildDeviceCreate(
		Registers the child device with the vmbus

		--*/
		static int
		VmbusChildDeviceAdd(
		struct hv_device *ChildDevice)
		int VmbusChildDeviceAdd(struct hv_device *ChildDevice)
		{
		VMBUS_DRIVER_OBJECT* vmbusDriver = (VMBUS_DRIVER_OBJECT*)gDriver;

		@@ -267,9 +263,7 @@ VmbusChildDeviceAdd(
		Unregisters the child device from the vmbus

		--*/
		static void
		VmbusChildDeviceRemove(
		struct hv_device *ChildDevice)
		void VmbusChildDeviceRemove(struct hv_device *ChildDevice)
		{
		VMBUS_DRIVER_OBJECT* vmbusDriver = (VMBUS_DRIVER_OBJECT*)gDriver;

drivers/staging/hv/VmbusPrivate.h

+32 −71

Original line number	Diff line number	Diff line
		@@ -30,30 +30,22 @@
		#include "Channel.h"
		#include "ChannelMgmt.h"
		#include "ChannelInterface.h"
		/* #include "ChannelMessages.h" */
		#include "RingBuffer.h"
		/* #include "Packet.h" */
		#include "include/List.h"


		/* Defines */


		/*
		* Maximum channels is determined by the size of the interrupt page
		* which is PAGE_SIZE. 1/2 of PAGE_SIZE is for send endpoint interrupt
		* and the other is receive endpoint interrupt
		*/
		#define MAX_NUM_CHANNELS (PAGE_SIZE >> 1) << 3 /* 16348 channels */
		#define MAX_NUM_CHANNELS ((PAGE_SIZE >> 1) << 3) /* 16348 channels */

		/* The value here must be in multiple of 32 */
		/* TODO: Need to make this configurable */
		#define MAX_NUM_CHANNELS_SUPPORTED 256


		/* Data types */


		enum VMBUS_CONNECT_STATE {
		Disconnected,
		Connecting,
		@@ -64,18 +56,16 @@ enum VMBUS_CONNECT_STATE {
		#define MAX_SIZE_CHANNEL_MESSAGE HV_MESSAGE_PAYLOAD_BYTE_COUNT

		struct VMBUS_CONNECTION {

		enum VMBUS_CONNECT_STATE ConnectState;

		atomic_t NextGpadlHandle;

		/*
		* Represents channel interrupts. Each bit position represents
		* a channel. When a channel sends an interrupt via VMBUS, it
		* finds its bit in the sendInterruptPage, set it and calls Hv
		* to generate a port event. The other end receives the port
		* event and parse the recvInterruptPage to see which bit is
		* set
		* Represents channel interrupts. Each bit position represents a
		* channel. When a channel sends an interrupt via VMBUS, it finds its
		* bit in the sendInterruptPage, set it and calls Hv to generate a port
		* event. The other end receives the port event and parse the
		* recvInterruptPage to see which bit is set
		*/
		void *InterruptPage;
		void *SendInterruptPage;
		@@ -109,65 +99,36 @@ struct VMBUS_MSGINFO {
		};



		/* Externs */

		extern struct VMBUS_CONNECTION gVmbusConnection;


		/* General vmbus interface */

		static struct hv_device*
		VmbusChildDeviceCreate(
		GUID deviceType,
		struct hv_device *VmbusChildDeviceCreate(GUID deviceType,
		GUID deviceInstance,
		void *context);

		static int
		VmbusChildDeviceAdd(
		struct hv_device *Device);
		int VmbusChildDeviceAdd(struct hv_device *Device);

		static void
		VmbusChildDeviceRemove(
		struct hv_device *Device);
		void VmbusChildDeviceRemove(struct hv_device *Device);

		/* static void */
		/* VmbusChildDeviceDestroy( */
		/* struct hv_device ); /

		static VMBUS_CHANNEL*
		GetChannelFromRelId(
		u32 relId
		);
		VMBUS_CHANNEL *GetChannelFromRelId(u32 relId);


		/* Connection interface */

		static int
		VmbusConnect(
		void
		);

		static int
		VmbusDisconnect(
		void
		);

		static int
		VmbusPostMessage(
		void * buffer,
		size_t bufSize
		);

		static int
		VmbusSetEvent(
		u32 childRelId
		);

		static void
		VmbusOnEvents(
		void
		);
		int VmbusConnect(void);

		int VmbusDisconnect(void);

		int VmbusPostMessage(void *buffer, size_t bufSize);

		int VmbusSetEvent(u32 childRelId);

		void VmbusOnEvents(void);


		#endif /* _VMBUS_PRIVATE_H_ */