aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/storvsc_drv.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-07-22 18:14:04 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-22 18:14:04 -0400
commit83c720ea395c4ee725e1035cbcda809794b46091 (patch)
treeba683a1eef41cfca86286a2d81d49068ac12d478 /drivers/staging/hv/storvsc_drv.c
parent2acadc269fa1957438e64684460c27a33e6d2b08 (diff)
Staging: hv: remove DPRINT_EXIT macro
No need for it, use the built-in kernel function tracing instead if you really need something like this. Cc: Hank Janssen <hjanssen@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/storvsc_drv.c')
-rw-r--r--drivers/staging/hv/storvsc_drv.c32
1 files changed, 2 insertions, 30 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 16d468529cd..075b61bd492 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -173,8 +173,6 @@ static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
173 /* The driver belongs to vmbus */ 173 /* The driver belongs to vmbus */
174 ret = vmbus_child_driver_register(drv_ctx); 174 ret = vmbus_child_driver_register(drv_ctx);
175 175
176 DPRINT_EXIT(STORVSC_DRV);
177
178 return ret; 176 return ret;
179} 177}
180 178
@@ -215,9 +213,6 @@ static void storvsc_drv_exit(void)
215 storvsc_drv_obj->Base.OnCleanup(&storvsc_drv_obj->Base); 213 storvsc_drv_obj->Base.OnCleanup(&storvsc_drv_obj->Base);
216 214
217 vmbus_child_driver_unregister(drv_ctx); 215 vmbus_child_driver_unregister(drv_ctx);
218
219 DPRINT_EXIT(STORVSC_DRV);
220
221 return; 216 return;
222} 217}
223 218
@@ -265,8 +260,6 @@ static int storvsc_probe(struct device *device)
265 260
266 if (!host_device_ctx->request_pool) { 261 if (!host_device_ctx->request_pool) {
267 scsi_host_put(host); 262 scsi_host_put(host);
268 DPRINT_EXIT(STORVSC_DRV);
269
270 return -ENOMEM; 263 return -ENOMEM;
271 } 264 }
272 265
@@ -278,8 +271,6 @@ static int storvsc_probe(struct device *device)
278 DPRINT_ERR(STORVSC_DRV, "unable to add scsi vsc device"); 271 DPRINT_ERR(STORVSC_DRV, "unable to add scsi vsc device");
279 kmem_cache_destroy(host_device_ctx->request_pool); 272 kmem_cache_destroy(host_device_ctx->request_pool);
280 scsi_host_put(host); 273 scsi_host_put(host);
281 DPRINT_EXIT(STORVSC_DRV);
282
283 return -1; 274 return -1;
284 } 275 }
285 276
@@ -303,15 +294,10 @@ static int storvsc_probe(struct device *device)
303 294
304 kmem_cache_destroy(host_device_ctx->request_pool); 295 kmem_cache_destroy(host_device_ctx->request_pool);
305 scsi_host_put(host); 296 scsi_host_put(host);
306 DPRINT_EXIT(STORVSC_DRV);
307
308 return -1; 297 return -1;
309 } 298 }
310 299
311 scsi_scan_host(host); 300 scsi_scan_host(host);
312
313 DPRINT_EXIT(STORVSC_DRV);
314
315 return ret; 301 return ret;
316} 302}
317 303
@@ -334,10 +320,8 @@ static int storvsc_remove(struct device *device)
334 (struct host_device_context *)host->hostdata; 320 (struct host_device_context *)host->hostdata;
335 321
336 322
337 if (!storvsc_drv_obj->Base.OnDeviceRemove) { 323 if (!storvsc_drv_obj->Base.OnDeviceRemove)
338 DPRINT_EXIT(STORVSC_DRV);
339 return -1; 324 return -1;
340 }
341 325
342 /* 326 /*
343 * Call to the vsc driver to let it know that the device is being 327 * Call to the vsc driver to let it know that the device is being
@@ -360,9 +344,6 @@ static int storvsc_remove(struct device *device)
360 344
361 DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host); 345 DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host);
362 scsi_host_put(host); 346 scsi_host_put(host);
363
364 DPRINT_EXIT(STORVSC_DRV);
365
366 return ret; 347 return ret;
367} 348}
368 349
@@ -417,8 +398,6 @@ static void storvsc_commmand_completion(struct hv_storvsc_request *request)
417 scsi_done_fn(scmnd); 398 scsi_done_fn(scmnd);
418 399
419 kmem_cache_free(host_device_ctx->request_pool, cmd_request); 400 kmem_cache_free(host_device_ctx->request_pool, cmd_request);
420
421 DPRINT_EXIT(STORVSC_DRV);
422} 401}
423 402
424static int do_bounce_buffer(struct scatterlist *sgl, unsigned int sg_count) 403static int do_bounce_buffer(struct scatterlist *sgl, unsigned int sg_count)
@@ -800,8 +779,6 @@ retry_request:
800 ret = SCSI_MLQUEUE_DEVICE_BUSY; 779 ret = SCSI_MLQUEUE_DEVICE_BUSY;
801 } 780 }
802 781
803 DPRINT_EXIT(STORVSC_DRV);
804
805 return ret; 782 return ret;
806} 783}
807 784
@@ -866,16 +843,12 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
866 843
867 /* Invokes the vsc to reset the host/bus */ 844 /* Invokes the vsc to reset the host/bus */
868 ret = StorVscOnHostReset(&device_ctx->device_obj); 845 ret = StorVscOnHostReset(&device_ctx->device_obj);
869 if (ret != 0) { 846 if (ret != 0)
870 DPRINT_EXIT(STORVSC_DRV);
871 return ret; 847 return ret;
872 }
873 848
874 DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host reseted", 849 DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host reseted",
875 scmnd->device, &device_ctx->device_obj); 850 scmnd->device, &device_ctx->device_obj);
876 851
877 DPRINT_EXIT(STORVSC_DRV);
878
879 return ret; 852 return ret;
880} 853}
881 854
@@ -965,7 +938,6 @@ static int __init storvsc_init(void)
965 938
966 DPRINT_INFO(STORVSC_DRV, "Storvsc initializing...."); 939 DPRINT_INFO(STORVSC_DRV, "Storvsc initializing....");
967 ret = storvsc_drv_init(StorVscInitialize); 940 ret = storvsc_drv_init(StorVscInitialize);
968 DPRINT_EXIT(STORVSC_DRV);
969 return ret; 941 return ret;
970} 942}
971 943