lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: hv: storvsc: remove last usage of DPRINT_WARN

Browse Source 
Used the correct dev_warn() call instead.

Cc: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2011-10-11 09:20:31 -06:00
parent a832a1eba9
commit d181daa06d
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/hv/storvsc_drv.c
View File

@@ -510,7 +510,7 @@ static void storvsc_on_io_completion(struct hv_device *device,
if (vstor_packet->vm_srb.scsi_status != 0 || if (vstor_packet->vm_srb.scsi_status != 0 ||
vstor_packet->vm_srb.srb_status != 1){ vstor_packet->vm_srb.srb_status != 1){
DPRINT_WARN(STORVSC, dev_warn(&device->device,
"cmd 0x%x scsi status 0x%x srb status 0x%x\n", "cmd 0x%x scsi status 0x%x srb status 0x%x\n",
stor_pkt->vm_srb.cdb[0], stor_pkt->vm_srb.cdb[0],
vstor_packet->vm_srb.scsi_status, vstor_packet->vm_srb.scsi_status,
@@ -521,9 +521,9 @@ static void storvsc_on_io_completion(struct hv_device *device,
/* CHECK_CONDITION */ /* CHECK_CONDITION */
if (vstor_packet->vm_srb.srb_status & 0x80) { if (vstor_packet->vm_srb.srb_status & 0x80) {
/* autosense data available */ /* autosense data available */
DPRINT_WARN(STORVSC, "storvsc pkt %p autosense data " dev_warn(&device->device,
"valid - len %d\n", request, "storvsc pkt %p autosense data valid - len %d\n",
vstor_packet->vm_srb.sense_info_length); request, vstor_packet->vm_srb.sense_info_length);
memcpy(request->sense_buffer, memcpy(request->sense_buffer,
vstor_packet->vm_srb.sense_data, vstor_packet->vm_srb.sense_data,

6
include/linux/hyperv.h
View File

@@ -721,7 +721,6 @@ extern void vmbus_ontimer(unsigned long data);
BLKVSC_DRV) BLKVSC_DRV)
/* Logging Level */ /* Logging Level */
#define WARNING_LVL 4
#define INFO_LVL 6 #define INFO_LVL 6
#define DEBUG_RING_LVL 9 #define DEBUG_RING_LVL 9
@@ -733,11 +732,6 @@ extern unsigned int vmbus_loglevel;
printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\ printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\
} while (0) } while (0)
#define DPRINT_WARN(mod, fmt, args...) do {\
if ((mod & (HIWORD(vmbus_loglevel))) && \
(WARNING_LVL <= LOWORD(vmbus_loglevel))) \
printk(KERN_WARNING #mod": WARNING! " fmt "\n", ## args);\
} while (0)
struct hv_driver; struct hv_driver;
struct hv_device; struct hv_device;