projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
hv
/
blkvsc_drv.c
diff --git
a/drivers/staging/hv/blkvsc_drv.c
b/drivers/staging/hv/blkvsc_drv.c
index 87a11c9293e95e28da2e562876bfb697b630a6e3..ff1d24720f11cf68f30e4c7aa8e5f2c108a1d304 100644
(file)
--- a/
drivers/staging/hv/blkvsc_drv.c
+++ b/
drivers/staging/hv/blkvsc_drv.c
@@
-176,8
+176,6
@@
static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx;
int ret;
struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx;
int ret;
- DPRINT_ENTER(BLKVSC_DRV);
-
vmbus_get_interface(&storvsc_drv_obj->Base.VmbusChannelInterface);
storvsc_drv_obj->RingBufferSize = blkvsc_ringbuffer_size;
vmbus_get_interface(&storvsc_drv_obj->Base.VmbusChannelInterface);
storvsc_drv_obj->RingBufferSize = blkvsc_ringbuffer_size;
@@
-196,8
+194,6
@@
static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
/* The driver belongs to vmbus */
ret = vmbus_child_driver_register(drv_ctx);
/* The driver belongs to vmbus */
ret = vmbus_child_driver_register(drv_ctx);
- DPRINT_EXIT(BLKVSC_DRV);
-
return ret;
}
return ret;
}
@@
-215,8
+211,6
@@
static void blkvsc_drv_exit(void)
struct device *current_dev;
int ret;
struct device *current_dev;
int ret;
- DPRINT_ENTER(BLKVSC_DRV);
-
while (1) {
current_dev = NULL;
while (1) {
current_dev = NULL;
@@
-242,8
+236,6
@@
static void blkvsc_drv_exit(void)
vmbus_child_driver_unregister(drv_ctx);
vmbus_child_driver_unregister(drv_ctx);
- DPRINT_EXIT(BLKVSC_DRV);
-
return;
}
return;
}
@@
-269,8
+261,6
@@
static int blkvsc_probe(struct device *device)
static int ide0_registered;
static int ide1_registered;
static int ide0_registered;
static int ide1_registered;
- DPRINT_ENTER(BLKVSC_DRV);
-
DPRINT_DBG(BLKVSC_DRV, "blkvsc_probe - enter");
if (!storvsc_drv_obj->Base.OnDeviceAdd) {
DPRINT_DBG(BLKVSC_DRV, "blkvsc_probe - enter");
if (!storvsc_drv_obj->Base.OnDeviceAdd) {
@@
-414,8
+404,6
@@
Cleanup:
blkdev = NULL;
}
blkdev = NULL;
}
- DPRINT_EXIT(BLKVSC_DRV);
-
return ret;
}
return ret;
}
@@
-752,14
+740,10
@@
static int blkvsc_remove(struct device *device)
unsigned long flags;
int ret;
unsigned long flags;
int ret;
- DPRINT_ENTER(BLKVSC_DRV);
-
DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");
DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");
- if (!storvsc_drv_obj->Base.OnDeviceRemove) {
- DPRINT_EXIT(BLKVSC_DRV);
+ if (!storvsc_drv_obj->Base.OnDeviceRemove)
return -1;
return -1;
- }
/*
* Call to the vsc driver to let it know that the device is being
/*
* Call to the vsc driver to let it know that the device is being
@@
-803,8
+787,6
@@
static int blkvsc_remove(struct device *device)
kfree(blkdev);
kfree(blkdev);
- DPRINT_EXIT(BLKVSC_DRV);
-
return ret;
}
return ret;
}
@@
-1499,22
+1481,16
@@
static int __init blkvsc_init(void)
BUILD_BUG_ON(sizeof(sector_t) != 8);
BUILD_BUG_ON(sizeof(sector_t) != 8);
- DPRINT_ENTER(BLKVSC_DRV);
-
DPRINT_INFO(BLKVSC_DRV, "Blkvsc initializing....");
ret = blkvsc_drv_init(BlkVscInitialize);
DPRINT_INFO(BLKVSC_DRV, "Blkvsc initializing....");
ret = blkvsc_drv_init(BlkVscInitialize);
- DPRINT_EXIT(BLKVSC_DRV);
-
return ret;
}
static void __exit blkvsc_exit(void)
{
return ret;
}
static void __exit blkvsc_exit(void)
{
- DPRINT_ENTER(BLKVSC_DRV);
blkvsc_drv_exit();
blkvsc_drv_exit();
- DPRINT_ENTER(BLKVSC_DRV);
}
MODULE_LICENSE("GPL");
}
MODULE_LICENSE("GPL");