Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/hv/Connection.c | 27 ++--------
drivers/staging/hv/Vmbus.c | 16 ++----
drivers/staging/hv/VmbusPrivate.h | 103 +++++++++++-------------------------
3 files changed, 43 insertions(+), 103 deletions(-)
diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c
index 1736434..0370a0b 100644
--- a/drivers/staging/hv/Connection.c
+++ b/drivers/staging/hv/Connection.c
@@ -44,8 +44,7 @@ Description:
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 @@ Description:
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 @@ Description:
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 @@ Description:
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 @@ Description:
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 @@ Description:
Send an event notification to the parent
--*/
-static int
-VmbusSetEvent(u32 childRelId)
+int VmbusSetEvent(u32 childRelId)
{
int ret=0;
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c
index 387ceab..50d2773 100644
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
@@ -224,11 +224,9 @@ Description:
--*/
-static struct hv_device*
-VmbusChildDeviceCreate(
- GUID DeviceType,
- GUID DeviceInstance,
- void *Context)
+struct hv_device *VmbusChildDeviceCreate(GUID DeviceType,
+ GUID DeviceInstance,
+ void *Context)
{
VMBUS_DRIVER_OBJECT* vmbusDriver = (VMBUS_DRIVER_OBJECT*)gDriver;
@@ -248,9 +246,7 @@ Description:
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 @@ Description:
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;
diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h
index 906736b..6b28418 100644
--- a/drivers/staging/hv/VmbusPrivate.h
+++ b/drivers/staging/hv/VmbusPrivate.h
@@ -30,28 +30,20 @@
#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 */
+#define MAX_NUM_CHANNELS_SUPPORTED 256
enum VMBUS_CONNECT_STATE {
@@ -61,36 +53,34 @@ enum VMBUS_CONNECT_STATE {
Disconnecting
};
-#define MAX_SIZE_CHANNEL_MESSAGE HV_MESSAGE_PAYLOAD_BYTE_COUNT
+#define MAX_SIZE_CHANNEL_MESSAGE HV_MESSAGE_PAYLOAD_BYTE_COUNT
struct VMBUS_CONNECTION {
-
- enum VMBUS_CONNECT_STATE ConnectState;
+ 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;
- void * RecvInterruptPage;
+ void *InterruptPage;
+ void *SendInterruptPage;
+ void *RecvInterruptPage;
/*
* 2 pages - 1st page for parent->child notification and 2nd
* is child->parent notification
*/
- void * MonitorPages;
- LIST_ENTRY ChannelMsgList;
+ void *MonitorPages;
+ LIST_ENTRY ChannelMsgList;
spinlock_t channelmsg_lock;
/* List of channels */
- LIST_ENTRY ChannelList;
+ LIST_ENTRY ChannelList;
spinlock_t channel_lock;
struct workqueue_struct *WorkQueue;
@@ -99,75 +89,46 @@ struct VMBUS_CONNECTION {
struct VMBUS_MSGINFO {
/* Bookkeeping stuff */
- LIST_ENTRY MsgListEntry;
+ LIST_ENTRY MsgListEntry;
/* Synchronize the request/response if needed */
struct osd_waitevent *WaitEvent;
/* The message itself */
- unsigned char Msg[0];
+ unsigned char Msg[0];
};
-
-/* Externs */
-
extern struct VMBUS_CONNECTION gVmbusConnection;
-
/* General vmbus interface */
-static struct hv_device*
-VmbusChildDeviceCreate(
- GUID deviceType,
- GUID deviceInstance,
- void *context);
+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_ */
--
1.6.4.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
