FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-25 19:07:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i2c: octeon: remove unused signal handling

Browse Source 
'commit 2637e5fd23 ("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>
This commit is contained in:
Nicholas Mc Guire 2015-06-11 16:12:03 +02:00 committed by Wolfram Sang
parent 955fc95079
commit e8e523a42a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/i2c/busses/i2c-octeon.c
View File

@ -200,7 +200,7 @@ static int octeon_i2c_test_iflg(struct octeon_i2c *i2c)
*/ */
static int octeon_i2c_wait(struct octeon_i2c *i2c) static int octeon_i2c_wait(struct octeon_i2c *i2c)
{ {
int result; long result;
octeon_i2c_int_enable(i2c); octeon_i2c_int_enable(i2c);
@ -210,10 +210,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c)
octeon_i2c_int_disable(i2c); octeon_i2c_int_disable(i2c);
if (result < 0) { if (result == 0) {
dev_dbg(i2c->dev, "%s: wait interrupted\n", __func__);
return result;
} else if (result == 0) {
dev_dbg(i2c->dev, "%s: timeout\n", __func__); dev_dbg(i2c->dev, "%s: timeout\n", __func__);
return -ETIMEDOUT; return -ETIMEDOUT;
} }