diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-15 15:46:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:01:47 -0400 |
commit | 0e727613ac6e1648d681a75d794862225c801d4b (patch) | |
tree | eae5231be9b64b8a08c2823aec5ab0760c64e131 | |
parent | 1f765540f49141e5418c3101df0f7580e7b10aa7 (diff) |
Staging: hv: remove TRUE, FALSE, and NULL usage
Don't define things that are either already provided (like NULL), or you
shouldn't use (like TRUE and FALSE).
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/hv/ChannelMgmt.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/Hv.c | 8 | ||||
-rw-r--r-- | drivers/staging/hv/NetVsc.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/RndisFilter.c | 10 | ||||
-rw-r--r-- | drivers/staging/hv/include/osd.h | 14 |
5 files changed, 13 insertions, 27 deletions
diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index b10db081a19..ff9c9d033f7 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c | |||
@@ -240,7 +240,7 @@ VmbusChannelProcessOffer( | |||
240 | VMBUS_CHANNEL* newChannel=(VMBUS_CHANNEL*)context; | 240 | VMBUS_CHANNEL* newChannel=(VMBUS_CHANNEL*)context; |
241 | LIST_ENTRY* anchor; | 241 | LIST_ENTRY* anchor; |
242 | LIST_ENTRY* curr; | 242 | LIST_ENTRY* curr; |
243 | bool fNew=TRUE; | 243 | bool fNew = true; |
244 | VMBUS_CHANNEL* channel; | 244 | VMBUS_CHANNEL* channel; |
245 | 245 | ||
246 | DPRINT_ENTER(VMBUS); | 246 | DPRINT_ENTER(VMBUS); |
@@ -255,7 +255,7 @@ VmbusChannelProcessOffer( | |||
255 | if (!memcmp(&channel->OfferMsg.Offer.InterfaceType, &newChannel->OfferMsg.Offer.InterfaceType,sizeof(GUID)) && | 255 | if (!memcmp(&channel->OfferMsg.Offer.InterfaceType, &newChannel->OfferMsg.Offer.InterfaceType,sizeof(GUID)) && |
256 | !memcmp(&channel->OfferMsg.Offer.InterfaceInstance, &newChannel->OfferMsg.Offer.InterfaceInstance, sizeof(GUID))) | 256 | !memcmp(&channel->OfferMsg.Offer.InterfaceInstance, &newChannel->OfferMsg.Offer.InterfaceInstance, sizeof(GUID))) |
257 | { | 257 | { |
258 | fNew = FALSE; | 258 | fNew = false; |
259 | break; | 259 | break; |
260 | } | 260 | } |
261 | } | 261 | } |
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c index 0e7397793ed..0e543ee9d5a 100644 --- a/drivers/staging/hv/Hv.c +++ b/drivers/staging/hv/Hv.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | // The one and only | 32 | // The one and only |
33 | HV_CONTEXT gHvContext={ | 33 | HV_CONTEXT gHvContext={ |
34 | .SynICInitialized = FALSE, | 34 | .SynICInitialized = false, |
35 | .HypercallPage = NULL, | 35 | .HypercallPage = NULL, |
36 | .SignalEventParam = NULL, | 36 | .SignalEventParam = NULL, |
37 | .SignalEventBuffer = NULL, | 37 | .SignalEventBuffer = NULL, |
@@ -571,8 +571,8 @@ HvSynicInit ( | |||
571 | 571 | ||
572 | sharedSint.AsUINT64 = 0; | 572 | sharedSint.AsUINT64 = 0; |
573 | sharedSint.Vector = irqVector; //HV_SHARED_SINT_IDT_VECTOR + 0x20; | 573 | sharedSint.Vector = irqVector; //HV_SHARED_SINT_IDT_VECTOR + 0x20; |
574 | sharedSint.Masked = FALSE; | 574 | sharedSint.Masked = false; |
575 | sharedSint.AutoEoi = TRUE; | 575 | sharedSint.AutoEoi = true; |
576 | 576 | ||
577 | DPRINT_DBG(VMBUS, "HV_X64_MSR_SINT1 msr set to: %llx", sharedSint.AsUINT64); | 577 | DPRINT_DBG(VMBUS, "HV_X64_MSR_SINT1 msr set to: %llx", sharedSint.AsUINT64); |
578 | 578 | ||
@@ -584,7 +584,7 @@ HvSynicInit ( | |||
584 | 584 | ||
585 | WriteMsr(HV_X64_MSR_SCONTROL, sctrl.AsUINT64); | 585 | WriteMsr(HV_X64_MSR_SCONTROL, sctrl.AsUINT64); |
586 | 586 | ||
587 | gHvContext.SynICInitialized = TRUE; | 587 | gHvContext.SynICInitialized = true; |
588 | 588 | ||
589 | DPRINT_EXIT(VMBUS); | 589 | DPRINT_EXIT(VMBUS); |
590 | 590 | ||
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c index ca0348aa55e..f3fd69ae18b 100644 --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c | |||
@@ -1345,7 +1345,7 @@ NetVscOnReceiveCompletion( | |||
1345 | DEVICE_OBJECT *device = (DEVICE_OBJECT*)packet->Device; | 1345 | DEVICE_OBJECT *device = (DEVICE_OBJECT*)packet->Device; |
1346 | NETVSC_DEVICE* netDevice; | 1346 | NETVSC_DEVICE* netDevice; |
1347 | u64 transactionId=0; | 1347 | u64 transactionId=0; |
1348 | bool fSendReceiveComp = FALSE; | 1348 | bool fSendReceiveComp = false; |
1349 | 1349 | ||
1350 | DPRINT_ENTER(NETVSC); | 1350 | DPRINT_ENTER(NETVSC); |
1351 | 1351 | ||
@@ -1371,7 +1371,7 @@ NetVscOnReceiveCompletion( | |||
1371 | // Return the xfer page packet itself to the freelist | 1371 | // Return the xfer page packet itself to the freelist |
1372 | if (packet->XferPagePacket->Count == 0) | 1372 | if (packet->XferPagePacket->Count == 0) |
1373 | { | 1373 | { |
1374 | fSendReceiveComp = TRUE; | 1374 | fSendReceiveComp = true; |
1375 | transactionId = packet->Completion.Recv.ReceiveCompletionTid; | 1375 | transactionId = packet->Completion.Recv.ReceiveCompletionTid; |
1376 | 1376 | ||
1377 | INSERT_TAIL_LIST(&netDevice->ReceivePacketList, &packet->XferPagePacket->ListEntry); | 1377 | INSERT_TAIL_LIST(&netDevice->ReceivePacketList, &packet->XferPagePacket->ListEntry); |
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index 92fc0520842..01507339e50 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c | |||
@@ -357,7 +357,7 @@ RndisFilterSendRequest( | |||
357 | // Setup the packet to send it | 357 | // Setup the packet to send it |
358 | packet = &Request->Packet; | 358 | packet = &Request->Packet; |
359 | 359 | ||
360 | packet->IsDataPacket = FALSE; | 360 | packet->IsDataPacket = false; |
361 | packet->TotalDataBufferLength = Request->RequestMessage.MessageLength; | 361 | packet->TotalDataBufferLength = Request->RequestMessage.MessageLength; |
362 | packet->PageBufferCount = 1; | 362 | packet->PageBufferCount = 1; |
363 | 363 | ||
@@ -384,7 +384,7 @@ RndisFilterReceiveResponse( | |||
384 | LIST_ENTRY *anchor; | 384 | LIST_ENTRY *anchor; |
385 | LIST_ENTRY *curr; | 385 | LIST_ENTRY *curr; |
386 | RNDIS_REQUEST *request=NULL; | 386 | RNDIS_REQUEST *request=NULL; |
387 | bool found=FALSE; | 387 | bool found = false; |
388 | 388 | ||
389 | DPRINT_ENTER(NETVSC); | 389 | DPRINT_ENTER(NETVSC); |
390 | 390 | ||
@@ -399,7 +399,7 @@ RndisFilterReceiveResponse( | |||
399 | DPRINT_DBG(NETVSC, "found rndis request for this response (id 0x%x req type 0x%x res type 0x%x)", | 399 | DPRINT_DBG(NETVSC, "found rndis request for this response (id 0x%x req type 0x%x res type 0x%x)", |
400 | request->RequestMessage.Message.InitializeRequest.RequestId, request->RequestMessage.NdisMessageType, Response->NdisMessageType); | 400 | request->RequestMessage.Message.InitializeRequest.RequestId, request->RequestMessage.NdisMessageType, Response->NdisMessageType); |
401 | 401 | ||
402 | found = TRUE; | 402 | found = true; |
403 | break; | 403 | break; |
404 | } | 404 | } |
405 | } | 405 | } |
@@ -485,7 +485,7 @@ RndisFilterReceiveData( | |||
485 | Packet->PageBuffers[0].Offset += dataOffset; | 485 | Packet->PageBuffers[0].Offset += dataOffset; |
486 | Packet->PageBuffers[0].Length -= dataOffset; | 486 | Packet->PageBuffers[0].Length -= dataOffset; |
487 | 487 | ||
488 | Packet->IsDataPacket = TRUE; | 488 | Packet->IsDataPacket = true; |
489 | 489 | ||
490 | gRndisFilter.InnerDriver.OnReceiveCallback(Device->NetDevice->Device, Packet); | 490 | gRndisFilter.InnerDriver.OnReceiveCallback(Device->NetDevice->Device, Packet); |
491 | 491 | ||
@@ -1112,7 +1112,7 @@ RndisFilterOnSend( | |||
1112 | rndisPacket->DataOffset = sizeof(RNDIS_PACKET); | 1112 | rndisPacket->DataOffset = sizeof(RNDIS_PACKET); |
1113 | rndisPacket->DataLength = Packet->TotalDataBufferLength; | 1113 | rndisPacket->DataLength = Packet->TotalDataBufferLength; |
1114 | 1114 | ||
1115 | Packet->IsDataPacket = TRUE; | 1115 | Packet->IsDataPacket = true; |
1116 | Packet->PageBuffers[0].Pfn = GetPhysicalAddress(rndisMessage) >> PAGE_SHIFT; | 1116 | Packet->PageBuffers[0].Pfn = GetPhysicalAddress(rndisMessage) >> PAGE_SHIFT; |
1117 | Packet->PageBuffers[0].Offset = (unsigned long)rndisMessage & (PAGE_SIZE-1); | 1117 | Packet->PageBuffers[0].Offset = (unsigned long)rndisMessage & (PAGE_SIZE-1); |
1118 | Packet->PageBuffers[0].Length = rndisMessageSize; | 1118 | Packet->PageBuffers[0].Length = rndisMessageSize; |
diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index ba44e685bf1..e4bbea8c3bd 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h | |||
@@ -37,20 +37,6 @@ | |||
37 | #define LOWORD(dw) ((unsigned short) (dw)) | 37 | #define LOWORD(dw) ((unsigned short) (dw)) |
38 | #define HIWORD(dw) ((unsigned short) (((unsigned int) (dw) >> 16) & 0xFFFF)) | 38 | #define HIWORD(dw) ((unsigned short) (((unsigned int) (dw) >> 16) & 0xFFFF)) |
39 | 39 | ||
40 | #ifdef FALSE | ||
41 | #undef FALSE | ||
42 | #endif | ||
43 | #define FALSE 0 | ||
44 | |||
45 | #ifdef TRUE | ||
46 | #undef TRUE | ||
47 | #endif | ||
48 | #define TRUE 1 | ||
49 | |||
50 | #ifndef NULL | ||
51 | #define NULL (void *)0 | ||
52 | #endif | ||
53 | |||
54 | typedef struct _DLIST_ENTRY { | 40 | typedef struct _DLIST_ENTRY { |
55 | struct _DLIST_ENTRY *Flink; | 41 | struct _DLIST_ENTRY *Flink; |
56 | struct _DLIST_ENTRY *Blink; | 42 | struct _DLIST_ENTRY *Blink; |