asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i2c-designware: Cosmetic cleanups

Browse source 
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Shinya Kuribayashi 2009-11-06 21:52:22 +09:00 committed by Ben Dooks
parent ce6eb574a1
commit a0e06ea64c
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/i2c/busses/i2c-designware.c
View file

@ -1,5 +1,5 @@
/* /*
* Synopsys Designware I2C adapter driver (master only). * Synopsys DesignWare I2C adapter driver (master only).
* *
* Based on the TI DAVINCI I2C adapter driver. * Based on the TI DAVINCI I2C adapter driver.
* *
@ -145,27 +145,27 @@
DW_IC_TX_ABRT_GCALL_NOACK) DW_IC_TX_ABRT_GCALL_NOACK)
static char *abort_sources[] = { static char *abort_sources[] = {
[ABRT_7B_ADDR_NOACK] = [ABRT_7B_ADDR_NOACK] =
"slave address not acknowledged (7bit mode)", "slave address not acknowledged (7bit mode)",
[ABRT_10ADDR1_NOACK] = [ABRT_10ADDR1_NOACK] =
"first address byte not acknowledged (10bit mode)", "first address byte not acknowledged (10bit mode)",
[ABRT_10ADDR2_NOACK] = [ABRT_10ADDR2_NOACK] =
"second address byte not acknowledged (10bit mode)", "second address byte not acknowledged (10bit mode)",
[ABRT_TXDATA_NOACK] = [ABRT_TXDATA_NOACK] =
"data not acknowledged", "data not acknowledged",
[ABRT_GCALL_NOACK] = [ABRT_GCALL_NOACK] =
"no acknowledgement for a general call", "no acknowledgement for a general call",
[ABRT_GCALL_READ] = [ABRT_GCALL_READ] =
"read after general call", "read after general call",
[ABRT_SBYTE_ACKDET] = [ABRT_SBYTE_ACKDET] =
"start byte acknowledged", "start byte acknowledged",
[ABRT_SBYTE_NORSTRT] = [ABRT_SBYTE_NORSTRT] =
"trying to send start byte when restart is disabled", "trying to send start byte when restart is disabled",
[ABRT_10B_RD_NORSTRT] = [ABRT_10B_RD_NORSTRT] =
"trying to read when restart is disabled (10bit mode)", "trying to read when restart is disabled (10bit mode)",
[ARB_MASTER_DIS] = [ABRT_MASTER_DIS] =
"trying to use disabled adapter", "trying to use disabled adapter",
[ARB_LOST] = [ARB_LOST] =
"lost arbitration", "lost arbitration",
}; };
@ -394,7 +394,8 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev)
intr_mask = DW_IC_INTR_DEFAULT_MASK; intr_mask = DW_IC_INTR_DEFAULT_MASK;
for (; dev->msg_write_idx < dev->msgs_num; dev->msg_write_idx++) { for (; dev->msg_write_idx < dev->msgs_num; dev->msg_write_idx++) {
/* if target address has changed, we need to /*
* if target address has changed, we need to
* reprogram the target address in the i2c * reprogram the target address in the i2c
* adapter when we are done with this transfer * adapter when we are done with this transfer
*/ */