Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[karo-tx-linux.git] / drivers / scsi / storvsc_drv.c

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 733e5f75951877f6884ce78c0295bf56540114b4..e3ba251fb6e75540f229af13a1af9f7f7d28dcbd 100644 (file)
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1097,7 +1097,8 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request)
        if (scmnd->result) {
                if (scsi_normalize_sense(scmnd->sense_buffer,
                                SCSI_SENSE_BUFFERSIZE, &sense_hdr))
-                       scsi_print_sense_hdr("storvsc", &sense_hdr);
+                       scsi_print_sense_hdr(scmnd->device, "storvsc",
+                                            &sense_hdr);
        }
 
        if (vm_srb->srb_status != SRB_STATUS_SUCCESS)
@@ -1428,8 +1429,7 @@ static void storvsc_device_destroy(struct scsi_device *sdevice)
 
 static int storvsc_device_configure(struct scsi_device *sdevice)
 {
-       scsi_adjust_queue_depth(sdevice, MSG_SIMPLE_TAG,
-                               STORVSC_MAX_IO_REQUESTS);
+       scsi_change_queue_depth(sdevice, STORVSC_MAX_IO_REQUESTS);
 
        blk_queue_max_segment_size(sdevice->request_queue, PAGE_SIZE);