From 3093b69171a027a4aa185a536446367dcec97965 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Fri, 22 Apr 2011 14:55:20 -0700 Subject: [PATCH] --- yaml --- r: 249139 b: refs/heads/master c: e01c33b886e7bcf44c8861853fb475efd248053c h: refs/heads/master i: 249137: 3e6c282327dd17a4895612832060d251217e6be8 249135: 1714fe6ab6558a6a40cfe9936d04e036d9d142dc v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/blkvsc_drv.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e668d57a1826..0553e4f63d2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d49198299928122d98ae7ca35dd824eaf8746ccd +refs/heads/master: e01c33b886e7bcf44c8861853fb475efd248053c diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index 92614d5ec8d0..35ad3d51c726 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -17,6 +17,8 @@ * Authors: * Haiyang Zhang * Hank Janssen + * + * 4/3/2011: K. Y. Srinivasan - Significant restructuring and cleanup. */ #include #include @@ -967,7 +969,6 @@ static int blkvsc_probe(struct device *device) if (!storvsc_drv_obj->base.dev_add) { - DPRINT_ERR(BLKVSC_DRV, "OnDeviceAdd() not set"); ret = -1; goto Cleanup; } @@ -995,10 +996,8 @@ static int blkvsc_probe(struct device *device) /* Call to the vsc driver to add the device */ ret = storvsc_drv_obj->base.dev_add(device_obj, &device_info); - if (ret != 0) { - DPRINT_ERR(BLKVSC_DRV, "unable to add blkvsc device"); + if (ret != 0) goto Cleanup; - } blkdev->device_ctx = device_obj; /* this identified the device 0 or 1 */ @@ -1040,7 +1039,6 @@ static int blkvsc_probe(struct device *device) ide1_registered = 1; } } else { - DPRINT_ERR(BLKVSC_DRV, "invalid pathid"); ret = -1; goto Cleanup; } @@ -1049,7 +1047,6 @@ static int blkvsc_probe(struct device *device) blkdev->gd = alloc_disk(BLKVSC_MINORS); if (!blkdev->gd) { - DPRINT_ERR(BLKVSC_DRV, "register_blkdev() failed! ret %d", ret); ret = -1; goto Cleanup; }