[PATCH 2/3 v2] i2c-eg20t: Call init() when wait-event timeout occurs

From: Tomoya MORINAGA
Date: Mon Mar 26 2012 - 02:34:03 EST


v1 had checkpatch warnings.

Signed-off-by: Tomoya MORINAGA <tomoya.rohm@xxxxxxxxx>
---
v2
- Updated for checkpatch
---
drivers/i2c/busses/i2c-eg20t.c | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index d73975b..0e3a89f 100644
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -445,7 +445,10 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap,
pch_i2c_init(adap);
return -EAGAIN;
} else { /* wait-event timeout */
+ pch_err(adap, "%s(L.%d):wait-event timeout\n",
+ __func__, __LINE__);
pch_i2c_stop(adap);
+ pch_i2c_init(adap);
return -ETIME;
}
} else {
@@ -469,7 +472,10 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap,
pch_i2c_init(adap);
return -EAGAIN;
} else { /* wait-event timeout */
+ pch_err(adap, "%s(L.%d):wait-event timeout\n",
+ __func__, __LINE__);
pch_i2c_stop(adap);
+ pch_i2c_init(adap);
return -ETIME;
}

@@ -490,7 +496,10 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap,
pch_clrbit(adap->pch_base_address, PCH_I2CSR,
I2CMIF_BIT);
} else { /* wait-event timeout */
+ pch_err(adap, "%s(L.%d):wait-event timeout\n",
+ __func__, __LINE__);
pch_i2c_stop(adap);
+ pch_i2c_init(adap);
return -ETIME;
}
}
@@ -598,7 +607,10 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
pch_i2c_init(adap);
return -EAGAIN;
} else { /* wait-event timeout */
+ pch_err(adap, "%s(L.%d):wait-event timeout\n",
+ __func__, __LINE__);
pch_i2c_stop(adap);
+ pch_i2c_init(adap);
return -ETIME;
}
pch_i2c_restart(adap);
@@ -621,7 +633,10 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
pch_i2c_init(adap);
return -EAGAIN;
} else { /* wait-event timeout */
+ pch_err(adap, "%s(L.%d):wait-event timeout\n",
+ __func__, __LINE__);
pch_i2c_stop(adap);
+ pch_i2c_init(adap);
return -ETIME;
}
} else {
@@ -648,7 +663,10 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
pch_i2c_init(adap);
return -EAGAIN;
} else { /* wait-event timeout */
+ pch_err(adap, "%s(L.%d):wait-event timeout\n",
+ __func__, __LINE__);
pch_i2c_stop(adap);
+ pch_i2c_init(adap);
return -ETIME;
}

@@ -677,7 +695,10 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
return -EIO;
}
} else { /* wait-event timeout */
+ pch_err(adap, "%s(L.%d):wait-event timeout\n",
+ __func__, __LINE__);
pch_i2c_stop(adap);
+ pch_i2c_init(adap);
return -ETIME;
}

@@ -698,7 +719,10 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
return -EIO;
}
} else { /* wait-event timeout */
+ pch_err(adap, "%s(L.%d):wait-event timeout\n",
+ __func__, __LINE__);
pch_i2c_stop(adap);
+ pch_i2c_init(adap);
return -ETIME;
}

--
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/