Staging: hv: remove INTERNAL typedef

The INTERNAL typedef is now removed from the Hyper-V driver code.

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

diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h
index 6fa49ce0963982a79cc1101ff6f55fdd191095f5..00433e12ab131d8d6d88c8f4ee6416abd09c48fe 100644 (file)
--- a/drivers/staging/hv/Channel.h
+++ b/drivers/staging/hv/Channel.h
@@ -62,7 +62,7 @@ typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
 // Routines
 //
 
-INTERNAL int
+static int
 VmbusChannelOpen(
        VMBUS_CHANNEL                   *Channel,
        UINT32                                  SendRingBufferSize,
@@ -73,12 +73,12 @@ VmbusChannelOpen(
        PVOID                                   Context
        );
 
-INTERNAL void
+static void
 VmbusChannelClose(
        VMBUS_CHANNEL           *Channel
        );
 
-INTERNAL int
+static int
 VmbusChannelSendPacket(
        VMBUS_CHANNEL           *Channel,
        const PVOID                     Buffer,
@@ -88,7 +88,7 @@ VmbusChannelSendPacket(
        UINT32                          Flags
 );
 
-INTERNAL int
+static int
 VmbusChannelSendPacketPageBuffer(
        VMBUS_CHANNEL           *Channel,
        PAGE_BUFFER                     PageBuffers[],
@@ -98,7 +98,7 @@ VmbusChannelSendPacketPageBuffer(
        UINT64                          RequestId
        );
 
-INTERNAL int
+static int
 VmbusChannelSendPacketMultiPageBuffer(
        VMBUS_CHANNEL           *Channel,
        MULTIPAGE_BUFFER        *MultiPageBuffer,
@@ -107,7 +107,7 @@ VmbusChannelSendPacketMultiPageBuffer(
        UINT64                          RequestId
 );
 
-INTERNAL int
+static int
 VmbusChannelEstablishGpadl(
        VMBUS_CHANNEL           *Channel,
        PVOID                           Kbuffer,        // from kmalloc()
@@ -115,13 +115,13 @@ VmbusChannelEstablishGpadl(
        UINT32                          *GpadlHandle
        );
 
-INTERNAL int
+static int
 VmbusChannelTeardownGpadl(
        VMBUS_CHANNEL   *Channel,
        UINT32                  GpadlHandle
        );
 
-INTERNAL int
+static int
 VmbusChannelRecvPacket(
        VMBUS_CHANNEL           *Channel,
        PVOID                           Buffer,
@@ -130,7 +130,7 @@ VmbusChannelRecvPacket(
        UINT64*                         RequestId
        );
 
-INTERNAL int
+static int
 VmbusChannelRecvPacketRaw(
        VMBUS_CHANNEL           *Channel,
        PVOID                           Buffer,
@@ -139,18 +139,18 @@ VmbusChannelRecvPacketRaw(
        UINT64*                         RequestId
        );
 
-INTERNAL void
+static void
 VmbusChannelOnChannelEvent(
        VMBUS_CHANNEL           *Channel
        );
 
-INTERNAL void
+static void
 VmbusChannelGetDebugInfo(
        VMBUS_CHANNEL                           *Channel,
        VMBUS_CHANNEL_DEBUG_INFO        *DebugInfo
        );
 
-INTERNAL void
+static void
 VmbusChannelOnTimer(
        void            *Context
        );

diff --git a/drivers/staging/hv/ChannelInterface.c b/drivers/staging/hv/ChannelInterface.c
index 1a7663e37e5e5edf1a5277f6ad83613ba97f2829..94b8245b141e985a19d447ab0950e42e71af0b5a 100644 (file)
--- a/drivers/staging/hv/ChannelInterface.c
+++ b/drivers/staging/hv/ChannelInterface.c
@@ -23,7 +23,7 @@
 
 #include "VmbusPrivate.h"
 
-INTERNAL int
+static int
 IVmbusChannelOpen(
        PDEVICE_OBJECT          Device,
        UINT32                          SendBufferSize,
@@ -44,7 +44,7 @@ IVmbusChannelOpen(
 }
 
 
-INTERNAL void
+static void
 IVmbusChannelClose(
        PDEVICE_OBJECT          Device
        )
@@ -53,7 +53,7 @@ IVmbusChannelClose(
 }
 
 
-INTERNAL int
+static int
 IVmbusChannelSendPacket(
        PDEVICE_OBJECT          Device,
        const PVOID                     Buffer,
@@ -71,7 +71,7 @@ IVmbusChannelSendPacket(
                                                                        Flags);
 }
 
-INTERNAL int
+static int
 IVmbusChannelSendPacketPageBuffer(
        PDEVICE_OBJECT          Device,
        PAGE_BUFFER                     PageBuffers[],
@@ -89,7 +89,7 @@ IVmbusChannelSendPacketPageBuffer(
                                                                                                RequestId);
 }
 
-INTERNAL int
+static int
 IVmbusChannelSendPacketMultiPageBuffer(
        PDEVICE_OBJECT          Device,
        MULTIPAGE_BUFFER        *MultiPageBuffer,
@@ -105,7 +105,7 @@ IVmbusChannelSendPacketMultiPageBuffer(
                                                                                                        RequestId);
 }
 
-INTERNAL int
+static int
 IVmbusChannelRecvPacket (
        PDEVICE_OBJECT          Device,
        PVOID                           Buffer,
@@ -121,7 +121,7 @@ IVmbusChannelRecvPacket (
                                                                        RequestId);
 }
 
-INTERNAL int
+static int
 IVmbusChannelRecvPacketRaw(
        PDEVICE_OBJECT          Device,
        PVOID                           Buffer,
@@ -137,7 +137,7 @@ IVmbusChannelRecvPacketRaw(
                                                                                RequestId);
 }
 
-INTERNAL int
+static int
 IVmbusChannelEstablishGpadl(
        PDEVICE_OBJECT          Device,
        PVOID                           Buffer,
@@ -151,7 +151,7 @@ IVmbusChannelEstablishGpadl(
                                                                                GpadlHandle);
 }
 
-INTERNAL int
+static int
 IVmbusChannelTeardownGpadl(
    PDEVICE_OBJECT              Device,
    UINT32                              GpadlHandle
@@ -162,7 +162,7 @@ IVmbusChannelTeardownGpadl(
 
 }
 
-INTERNAL void
+static void
 GetChannelInterface(
        VMBUS_CHANNEL_INTERFACE *ChannelInterface
        )
@@ -180,7 +180,7 @@ GetChannelInterface(
 }
 
 
-INTERNAL void
+static void
 GetChannelInfo(
        PDEVICE_OBJECT          Device,
        DEVICE_INFO                     *DeviceInfo

diff --git a/drivers/staging/hv/ChannelInterface.h b/drivers/staging/hv/ChannelInterface.h
index b9d044610675711a1da6b052ea31038fcc8098ed..c459e0e23fd521fbfa818f6f497ce46871b7bf6e 100644 (file)
--- a/drivers/staging/hv/ChannelInterface.h
+++ b/drivers/staging/hv/ChannelInterface.h
@@ -27,12 +27,12 @@
 
 #include "include/VmbusApi.h"
 
-INTERNAL void
+static void
 GetChannelInterface(
        VMBUS_CHANNEL_INTERFACE *ChannelInterface
        );
 
-INTERNAL void
+static void
 GetChannelInfo(
        PDEVICE_OBJECT          Device,
        DEVICE_INFO                     *DeviceInfo

diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h
index a8223d0d2456d32c0b3a8d5024c37e3f643d0765..dde3e69d5d3f68951b266e018eb9ce3195110d3f 100644 (file)
--- a/drivers/staging/hv/ChannelMgmt.h
+++ b/drivers/staging/hv/ChannelMgmt.h
@@ -128,27 +128,27 @@ typedef struct _VMBUS_CHANNEL_MSGINFO {
 // Routines
 //
 
-INTERNAL VMBUS_CHANNEL*
+static VMBUS_CHANNEL*
 AllocVmbusChannel(
        void
        );
 
-INTERNAL void
+static void
 FreeVmbusChannel(
        VMBUS_CHANNEL *Channel
        );
 
-INTERNAL void
+static void
 VmbusOnChannelMessage(
        void *Context
        );
 
-INTERNAL int
+static int
 VmbusChannelRequestOffers(
        void
        );
 
-INTERNAL void
+static void
 VmbusChannelReleaseUnattachedChannels(
        void
        );

diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h
index beb3b28e793d2d2de4df37979729610514659dd2..a842e18e448c38ef2621c4dd8297e7c1b04b2bb1 100644 (file)
--- a/drivers/staging/hv/Hv.h
+++ b/drivers/staging/hv/Hv.h
@@ -148,17 +148,17 @@ static inline void WriteMsr(int msr, UINT64 val)
 //
 // Hv Interface
 //
-INTERNAL int
+static int
 HvInit(
     VOID
     );
 
-INTERNAL VOID
+static VOID
 HvCleanup(
     VOID
     );
 
-INTERNAL HV_STATUS
+static HV_STATUS
 HvPostMessage(
        HV_CONNECTION_ID connectionId,
        HV_MESSAGE_TYPE  messageType,
@@ -166,17 +166,17 @@ HvPostMessage(
        SIZE_T           payloadSize
        );
 
-INTERNAL HV_STATUS
+static HV_STATUS
 HvSignalEvent(
        VOID
        );
 
-INTERNAL int
+static int
 HvSynicInit(
        UINT32          irqVector
        );
 
-INTERNAL VOID
+static VOID
 HvSynicCleanup(
        VOID
        );

diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/RingBuffer.h
index 99d75c305bc671394f0f41d3dac619220a2f8fe4..fb2dce1b7614702f4148158bb0f982aa71c53620 100644 (file)
--- a/drivers/staging/hv/RingBuffer.h
+++ b/drivers/staging/hv/RingBuffer.h
@@ -69,33 +69,33 @@ typedef struct _RING_BUFFER_DEBUG_INFO {
 // Interface
 //
 
-INTERNAL int
+static int
 RingBufferInit(
        RING_BUFFER_INFO        *RingInfo,
        PVOID                           Buffer,
        UINT32                          BufferLen
        );
 
-INTERNAL void
+static void
 RingBufferCleanup(
        RING_BUFFER_INFO        *RingInfo
        );
 
-INTERNAL int
+static int
 RingBufferWrite(
        RING_BUFFER_INFO        *RingInfo,
        SG_BUFFER_LIST          SgBuffers[],
        UINT32                          SgBufferCount
        );
 
-INTERNAL int
+static int
 RingBufferPeek(
        RING_BUFFER_INFO        *RingInfo,
        PVOID                           Buffer,
        UINT32                          BufferLen
        );
 
-INTERNAL int
+static int
 RingBufferRead(
        RING_BUFFER_INFO        *RingInfo,
        PVOID                           Buffer,
@@ -103,18 +103,18 @@ RingBufferRead(
        UINT32                          Offset
        );
 
-INTERNAL UINT32
+static UINT32
 GetRingBufferInterruptMask(
        RING_BUFFER_INFO *RingInfo
        );
 
-INTERNAL void
+static void
 DumpRingInfo(
        RING_BUFFER_INFO* RingInfo,
        char *Prefix
        );
 
-INTERNAL void
+static void
 RingBufferGetDebugInfo(
        RING_BUFFER_INFO                *RingInfo,
        RING_BUFFER_DEBUG_INFO  *DebugInfo

diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h
index 9027c8cf70cd9671c466670e9e1301257f2d9396..9ce0c5b2b90d559b73f3fd1f6b2a8df9322b796d 100644 (file)
--- a/drivers/staging/hv/VmbusPrivate.h
+++ b/drivers/staging/hv/VmbusPrivate.h
@@ -25,10 +25,6 @@
 #ifndef _VMBUS_PRIVATE_H_
 #define _VMBUS_PRIVATE_H_
 
-#ifndef INTERNAL
-#define INTERNAL static
-#endif
-
 #include "Hv.h"
 #include "include/VmbusApi.h"
 #include "Channel.h"
@@ -114,25 +110,25 @@ extern VMBUS_CONNECTION gVmbusConnection;
 //
 // General vmbus interface
 //
-INTERNAL DEVICE_OBJECT*
+static DEVICE_OBJECT*
 VmbusChildDeviceCreate(
        GUID deviceType,
        GUID deviceInstance,
        void *context);
 
-INTERNAL int
+static int
 VmbusChildDeviceAdd(
        DEVICE_OBJECT* Device);
 
-INTERNAL void
+static void
 VmbusChildDeviceRemove(
    DEVICE_OBJECT* Device);
 
-//INTERNAL void
+//static void
 //VmbusChildDeviceDestroy(
 //     DEVICE_OBJECT*);
 
-INTERNAL VMBUS_CHANNEL*
+static VMBUS_CHANNEL*
 GetChannelFromRelId(
        UINT32 relId
        );
@@ -140,28 +136,28 @@ GetChannelFromRelId(
 //
 // Connection interface
 //
-INTERNAL int
+static int
 VmbusConnect(
        VOID
        );
 
-INTERNAL int
+static int
 VmbusDisconnect(
        VOID
        );
 
-INTERNAL int
+static int
 VmbusPostMessage(
        PVOID                   buffer,
        SIZE_T                  bufSize
        );
 
-INTERNAL int
+static int
 VmbusSetEvent(
        UINT32 childRelId
        );
 
-INTERNAL VOID
+static VOID
 VmbusOnEvents(
   VOID
        );