xnu-6153.41.3.tar.gz

[apple/xnu.git] / iokit / Kernel / IOCommandGate.cpp

diff --git a/iokit/Kernel/IOCommandGate.cpp b/iokit/Kernel/IOCommandGate.cpp
index 265b2f7860725434aa52bc57b0b58e176486e637..1ae9bcf0880b1b9610128e2a300943147e57de8a 100644 (file)
--- a/iokit/Kernel/IOCommandGate.cpp
+++ b/iokit/Kernel/IOCommandGate.cpp
@@ -86,7 +86,7 @@ IOCommandGate::commandGate(OSObject *inOwner, Action inAction)
 
        if (me && !me->init(inOwner, inAction)) {
                me->release();
-               return 0;
+               return NULL;
        }
 
        return me;
@@ -117,7 +117,7 @@ IOCommandGate::enable()
 IOCommandGate::free()
 {
        if (workLoop) {
-               setWorkLoop(0);
+               setWorkLoop(NULL);
        }
        super::free();
 }
@@ -146,7 +146,7 @@ IOCommandGate::setWorkLoop(IOWorkLoop *inWorkLoop)
                *sleepersP &= ~kSleepersWaitEnabled;
                defer = (0 != (kSleepersActionsMask & *sleepersP));
                if (!defer) {
-                       super::setWorkLoop(0);
+                       super::setWorkLoop(NULL);
                        *sleepersP &= ~kSleepersRemoved;
                }
                wl->openGate();
@@ -180,9 +180,9 @@ IOCommandGateActionToBlock(OSObject *owner,
 }
 
 IOReturn
-IOCommandGate::runActionBlock(ActionBlock action)
+IOCommandGate::runActionBlock(ActionBlock _action)
 {
-       return runAction(&IOCommandGateActionToBlock, action);
+       return runAction(&IOCommandGateActionToBlock, _action);
 }
 
 IOReturn
@@ -250,7 +250,7 @@ IOCommandGate::runAction(Action inAction,
        if (kSleepersRemoved == ((kSleepersActionsMask | kSleepersRemoved) & *sleepersP)) {
                // no actions outstanding
                *sleepersP &= ~kSleepersRemoved;
-               super::setWorkLoop(0);
+               super::setWorkLoop(NULL);
        }
 
        wl->openGate();