Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[karo-tx-linux.git] / drivers / staging / hv / storvsc.c

diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 27a276e08ee9c45148d4eb95dde535b0a9b7cbbd..6bd2ff138d24527e6b2ba0f1428ea4bdf4063c03 100644 (file)
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -186,7 +186,6 @@ static int StorVscChannelInit(struct hv_device *Device)
        if (!storDevice) {
                DPRINT_ERR(STORVSC, "unable to get stor device..."
                           "device being destroyed?");
-               DPRINT_EXIT(STORVSC);
                return -1;
        }
 
@@ -344,8 +343,6 @@ Cleanup:
        request->WaitEvent = NULL;
 nomem:
        PutStorDevice(Device);
-
-       DPRINT_EXIT(STORVSC);
        return ret;
 }
 
@@ -356,13 +353,10 @@ static void StorVscOnIOCompletion(struct hv_device *Device,
        struct hv_storvsc_request *request;
        struct storvsc_device *storDevice;
 
-       DPRINT_ENTER(STORVSC);
-
        storDevice = MustGetStorDevice(Device);
        if (!storDevice) {
                DPRINT_ERR(STORVSC, "unable to get stor device..."
                           "device being destroyed?");
-               DPRINT_EXIT(STORVSC);
                return;
        }
 
@@ -414,8 +408,6 @@ static void StorVscOnIOCompletion(struct hv_device *Device,
        atomic_dec(&storDevice->NumOutstandingRequests);
 
        PutStorDevice(Device);
-
-       DPRINT_EXIT(STORVSC);
 }
 
 static void StorVscOnReceive(struct hv_device *Device,
@@ -449,15 +441,12 @@ static void StorVscOnChannelCallback(void *context)
        struct storvsc_request_extension *request;
        int ret;
 
-       DPRINT_ENTER(STORVSC);
-
        /* ASSERT(device); */
 
        storDevice = MustGetStorDevice(device);
        if (!storDevice) {
                DPRINT_ERR(STORVSC, "unable to get stor device..."
                           "device being destroyed?");
-               DPRINT_EXIT(STORVSC);
                return;
        }
 
@@ -501,8 +490,6 @@ static void StorVscOnChannelCallback(void *context)
        } while (1);
 
        PutStorDevice(device);
-
-       DPRINT_EXIT(STORVSC);
        return;
 }
 
@@ -547,8 +534,6 @@ static int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
        struct storvsc_device_info *deviceInfo;
        int ret = 0;
 
-       DPRINT_ENTER(STORVSC);
-
        deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
        storDevice = AllocStorDevice(Device);
        if (!storDevice) {
@@ -584,8 +569,6 @@ static int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
                   storDevice->TargetId);
 
 Cleanup:
-       DPRINT_EXIT(STORVSC);
-
        return ret;
 }
 
@@ -596,8 +579,6 @@ static int StorVscOnDeviceRemove(struct hv_device *Device)
 {
        struct storvsc_device *storDevice;
 
-       DPRINT_ENTER(STORVSC);
-
        DPRINT_INFO(STORVSC, "disabling storage device (%p)...",
                    Device->Extension);
 
@@ -625,8 +606,6 @@ static int StorVscOnDeviceRemove(struct hv_device *Device)
        Device->Driver->VmbusChannelInterface.Close(Device);
 
        FreeStorDevice(storDevice);
-
-       DPRINT_EXIT(STORVSC);
        return 0;
 }
 
@@ -637,15 +616,12 @@ int StorVscOnHostReset(struct hv_device *Device)
        struct vstor_packet *vstorPacket;
        int ret;
 
-       DPRINT_ENTER(STORVSC);
-
        DPRINT_INFO(STORVSC, "resetting host adapter...");
 
        storDevice = GetStorDevice(Device);
        if (!storDevice) {
                DPRINT_ERR(STORVSC, "unable to get stor device..."
                           "device being destroyed?");
-               DPRINT_EXIT(STORVSC);
                return -1;
        }
 
@@ -687,7 +663,6 @@ int StorVscOnHostReset(struct hv_device *Device)
 
 Cleanup:
        PutStorDevice(Device);
-       DPRINT_EXIT(STORVSC);
        return ret;
 }
 
@@ -702,8 +677,6 @@ static int StorVscOnIORequest(struct hv_device *Device,
        struct vstor_packet *vstorPacket;
        int ret = 0;
 
-       DPRINT_ENTER(STORVSC);
-
        requestExtension =
                (struct storvsc_request_extension *)Request->Extension;
        vstorPacket = &requestExtension->VStorPacket;
@@ -720,7 +693,6 @@ static int StorVscOnIORequest(struct hv_device *Device,
        if (!storDevice) {
                DPRINT_ERR(STORVSC, "unable to get stor device..."
                           "device being destroyed?");
-               DPRINT_EXIT(STORVSC);
                return -2;
        }
 
@@ -786,8 +758,6 @@ static int StorVscOnIORequest(struct hv_device *Device,
        atomic_inc(&storDevice->NumOutstandingRequests);
 
        PutStorDevice(Device);
-
-       DPRINT_EXIT(STORVSC);
        return ret;
 }
 
@@ -796,8 +766,6 @@ static int StorVscOnIORequest(struct hv_device *Device,
  */
 static void StorVscOnCleanup(struct hv_driver *Driver)
 {
-       DPRINT_ENTER(STORVSC);
-       DPRINT_EXIT(STORVSC);
 }
 
 /*
@@ -807,8 +775,6 @@ int StorVscInitialize(struct hv_driver *Driver)
 {
        struct storvsc_driver_object *storDriver;
 
-       DPRINT_ENTER(STORVSC);
-
        storDriver = (struct storvsc_driver_object *)Driver;
 
        DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%zd "
@@ -852,7 +818,5 @@ int StorVscInitialize(struct hv_driver *Driver)
 
        storDriver->OnIORequest         = StorVscOnIORequest;
 
-       DPRINT_EXIT(STORVSC);
-
        return 0;
 }