aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-octeon.c
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-06-11 10:12:03 -0400
committerWolfram Sang <wsa@the-dreams.de>2015-06-17 08:50:03 -0400
commite8e523a42a236d0e80a5651741cfc916aa298e3f (patch)
tree5e06ab4e20f0f552d94bb23316079e07ad7741c2 /drivers/i2c/busses/i2c-octeon.c
parent955fc950795d1c9f11f220f449ecb29b92985ee2 (diff)
i2c: octeon: remove unused signal handling
'commit 2637e5fd232d ("i2c: octeon: Fix i2c fail problem when a process is terminated by a signal")' removed the wait_event_interruptible_timeout to prevent half/mixed i2c messages from being sent/recievd but forgot to drop the signal handling case in the return handling. This just removes this dead code. While at it the return variable is adjusted to the type expected. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Reviewed-by: Alexander Sverdlin <alexander.sverdlin@nokia.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-octeon.c')
-rw-r--r--drivers/i2c/busses/i2c-octeon.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
index 6e75e016bffc..32914ab42a19 100644
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon.c
@@ -200,7 +200,7 @@ static int octeon_i2c_test_iflg(struct octeon_i2c *i2c)
200 */ 200 */
201static int octeon_i2c_wait(struct octeon_i2c *i2c) 201static int octeon_i2c_wait(struct octeon_i2c *i2c)
202{ 202{
203 int result; 203 long result;
204 204
205 octeon_i2c_int_enable(i2c); 205 octeon_i2c_int_enable(i2c);
206 206
@@ -210,10 +210,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c)
210 210
211 octeon_i2c_int_disable(i2c); 211 octeon_i2c_int_disable(i2c);
212 212
213 if (result < 0) { 213 if (result == 0) {
214 dev_dbg(i2c->dev, "%s: wait interrupted\n", __func__);
215 return result;
216 } else if (result == 0) {
217 dev_dbg(i2c->dev, "%s: timeout\n", __func__); 214 dev_dbg(i2c->dev, "%s: timeout\n", __func__);
218 return -ETIMEDOUT; 215 return -ETIMEDOUT;
219 } 216 }