[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1423118842-25233-1-git-send-email-hofrat@osadl.org>
Date: Thu, 5 Feb 2015 01:47:22 -0500
From: Nicholas Mc Guire <hofrat@...dl.org>
To: "K. Y. Srinivasan" <kys@...rosoft.com>
Cc: Haiyang Zhang <haiyangz@...rosoft.com>,
"James E.J. Bottomley" <JBottomley@...allels.com>,
devel@...uxdriverproject.org, linux-scsi@...r.kernel.org,
linux-kernel@...r.kernel.org, Nicholas Mc Guire <hofrat@...dl.org>
Subject: [PATCH] storvsc: assign wait_for_completion_timeout to appropriately typed var
wait_for_completion_timeout() returns unsigned long not int. This assigns
the return value to an appropriately typed variable.
Signed-off-by: Nicholas Mc Guire <hofrat@...dl.org>
---
As a suitable typed and named variable "timeout" is available and there is
no conflict in this case no new variable is needed rather the declaration
is simply updated.
Patch was only compile tested for x86_64_defconfig + CONFIG_X86_VSMP=y
CONFIG_HYPERV=m, SCSI_LOWLEVEL=y, CONFIG_HYPERV_STORAGE=m
Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)
drivers/scsi/storvsc_drv.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index efc6e44..a993d12 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -796,7 +796,8 @@ static void handle_multichannel_storage(struct hv_device *device, int max_chns)
int num_sc;
struct storvsc_cmd_request *request;
struct vstor_packet *vstor_packet;
- int ret, t;
+ int ret;
+ unsigned long t;
num_sc = ((max_chns > num_cpus) ? num_cpus : max_chns);
stor_device = get_out_stor_device(device);
@@ -861,7 +862,8 @@ static int storvsc_channel_init(struct hv_device *device)
struct storvsc_device *stor_device;
struct storvsc_cmd_request *request;
struct vstor_packet *vstor_packet;
- int ret, t;
+ int ret;
+ unsigned long t;
int max_chns;
bool process_sub_channels = false;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists