aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-06-29 20:59:04 -0400
committerMichael S. Tsirkin <mst@redhat.com>2015-07-07 07:27:03 -0400
commit908a5544cd29ed60114ed60bded6dbe8cdd56326 (patch)
treef5e2af14e04fb053e296b64ec79855bd08f69952
parentbcfeacab45e6d419c6bafc0e57ea4b1125e23231 (diff)
virtio scsi: fix unused variable warning
drivers/scsi/virtio_scsi.c: In function 'virtscsi_probe': drivers/scsi/virtio_scsi.c:952:11: warning: unused variable 'host_prot' [-Wunused-variable] int err, host_prot; ^ Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--drivers/scsi/virtio_scsi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index f164f24a4a55..55441c7f3e83 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -944,7 +944,7 @@ static int virtscsi_probe(struct virtio_device *vdev)
944{ 944{
945 struct Scsi_Host *shost; 945 struct Scsi_Host *shost;
946 struct virtio_scsi *vscsi; 946 struct virtio_scsi *vscsi;
947 int err, host_prot; 947 int err;
948 u32 sg_elems, num_targets; 948 u32 sg_elems, num_targets;
949 u32 cmd_per_lun; 949 u32 cmd_per_lun;
950 u32 num_queues; 950 u32 num_queues;
@@ -1003,6 +1003,8 @@ static int virtscsi_probe(struct virtio_device *vdev)
1003 shost->nr_hw_queues = num_queues; 1003 shost->nr_hw_queues = num_queues;
1004 1004
1005 if (virtio_has_feature(vdev, VIRTIO_SCSI_F_T10_PI)) { 1005 if (virtio_has_feature(vdev, VIRTIO_SCSI_F_T10_PI)) {
1006 int host_prot;
1007
1006 host_prot = SHOST_DIF_TYPE1_PROTECTION | SHOST_DIF_TYPE2_PROTECTION | 1008 host_prot = SHOST_DIF_TYPE1_PROTECTION | SHOST_DIF_TYPE2_PROTECTION |
1007 SHOST_DIF_TYPE3_PROTECTION | SHOST_DIX_TYPE1_PROTECTION | 1009 SHOST_DIF_TYPE3_PROTECTION | SHOST_DIX_TYPE1_PROTECTION |
1008 SHOST_DIX_TYPE2_PROTECTION | SHOST_DIX_TYPE3_PROTECTION; 1010 SHOST_DIX_TYPE2_PROTECTION | SHOST_DIX_TYPE3_PROTECTION;