diff options
author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-02-08 05:43:52 -0500 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2015-03-15 05:29:53 -0400 |
commit | 73958562f1ca5c91d802c845856c4a9edcf468cb (patch) | |
tree | 98bf27bd9394f76c83a8dd947c3905c4049bb985 /drivers/i2c | |
parent | c4dc12167db8c7c22b38ab5180afdd5c2acba783 (diff) |
i2c: wmt: match return type of wait_for_completion_timeout
return type of wait_for_completion_timeout is unsigned long not int. as
wait_result is only used for wait_for_completion_timeout here the type
is simply changed to unsigned long.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-wmt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c index 26e49e6b4446..e1e3a85596c5 100644 --- a/drivers/i2c/busses/i2c-wmt.c +++ b/drivers/i2c/busses/i2c-wmt.c | |||
@@ -128,7 +128,8 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg, | |||
128 | { | 128 | { |
129 | struct wmt_i2c_dev *i2c_dev = i2c_get_adapdata(adap); | 129 | struct wmt_i2c_dev *i2c_dev = i2c_get_adapdata(adap); |
130 | u16 val, tcr_val; | 130 | u16 val, tcr_val; |
131 | int ret, wait_result; | 131 | int ret; |
132 | unsigned long wait_result; | ||
132 | int xfer_len = 0; | 133 | int xfer_len = 0; |
133 | 134 | ||
134 | if (!(pmsg->flags & I2C_M_NOSTART)) { | 135 | if (!(pmsg->flags & I2C_M_NOSTART)) { |
@@ -218,7 +219,8 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg, | |||
218 | { | 219 | { |
219 | struct wmt_i2c_dev *i2c_dev = i2c_get_adapdata(adap); | 220 | struct wmt_i2c_dev *i2c_dev = i2c_get_adapdata(adap); |
220 | u16 val, tcr_val; | 221 | u16 val, tcr_val; |
221 | int ret, wait_result; | 222 | int ret; |
223 | unsigned long wait_result; | ||
222 | u32 xfer_len = 0; | 224 | u32 xfer_len = 0; |
223 | 225 | ||
224 | if (!(pmsg->flags & I2C_M_NOSTART)) { | 226 | if (!(pmsg->flags & I2C_M_NOSTART)) { |