diff options
| author | Shinya Kuribayashi <shinya.kuribayashi@necel.com> | 2009-11-06 07:52:22 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-08 19:19:13 -0500 |
| commit | a0e06ea64cd2b4b7eee9c196bf623d6c9e44df7c (patch) | |
| tree | 3122928e7f34d8c4871bf1e244314d9134e90b79 | |
| parent | ce6eb574a1d9bbde72998ed9c95e9bf35c8f4131 (diff) | |
i2c-designware: Cosmetic cleanups
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | drivers/i2c/busses/i2c-designware.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c index 887aed6601fb..4534d4554ff4 100644 --- a/drivers/i2c/busses/i2c-designware.c +++ b/drivers/i2c/busses/i2c-designware.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Synopsys Designware I2C adapter driver (master only). | 2 | * Synopsys DesignWare I2C adapter driver (master only). |
| 3 | * | 3 | * |
| 4 | * Based on the TI DAVINCI I2C adapter driver. | 4 | * Based on the TI DAVINCI I2C adapter driver. |
| 5 | * | 5 | * |
| @@ -145,27 +145,27 @@ | |||
| 145 | DW_IC_TX_ABRT_GCALL_NOACK) | 145 | DW_IC_TX_ABRT_GCALL_NOACK) |
| 146 | 146 | ||
| 147 | static char *abort_sources[] = { | 147 | static char *abort_sources[] = { |
| 148 | [ABRT_7B_ADDR_NOACK] = | 148 | [ABRT_7B_ADDR_NOACK] = |
| 149 | "slave address not acknowledged (7bit mode)", | 149 | "slave address not acknowledged (7bit mode)", |
| 150 | [ABRT_10ADDR1_NOACK] = | 150 | [ABRT_10ADDR1_NOACK] = |
| 151 | "first address byte not acknowledged (10bit mode)", | 151 | "first address byte not acknowledged (10bit mode)", |
| 152 | [ABRT_10ADDR2_NOACK] = | 152 | [ABRT_10ADDR2_NOACK] = |
| 153 | "second address byte not acknowledged (10bit mode)", | 153 | "second address byte not acknowledged (10bit mode)", |
| 154 | [ABRT_TXDATA_NOACK] = | 154 | [ABRT_TXDATA_NOACK] = |
| 155 | "data not acknowledged", | 155 | "data not acknowledged", |
| 156 | [ABRT_GCALL_NOACK] = | 156 | [ABRT_GCALL_NOACK] = |
| 157 | "no acknowledgement for a general call", | 157 | "no acknowledgement for a general call", |
| 158 | [ABRT_GCALL_READ] = | 158 | [ABRT_GCALL_READ] = |
| 159 | "read after general call", | 159 | "read after general call", |
| 160 | [ABRT_SBYTE_ACKDET] = | 160 | [ABRT_SBYTE_ACKDET] = |
| 161 | "start byte acknowledged", | 161 | "start byte acknowledged", |
| 162 | [ABRT_SBYTE_NORSTRT] = | 162 | [ABRT_SBYTE_NORSTRT] = |
| 163 | "trying to send start byte when restart is disabled", | 163 | "trying to send start byte when restart is disabled", |
| 164 | [ABRT_10B_RD_NORSTRT] = | 164 | [ABRT_10B_RD_NORSTRT] = |
| 165 | "trying to read when restart is disabled (10bit mode)", | 165 | "trying to read when restart is disabled (10bit mode)", |
| 166 | [ARB_MASTER_DIS] = | 166 | [ABRT_MASTER_DIS] = |
| 167 | "trying to use disabled adapter", | 167 | "trying to use disabled adapter", |
| 168 | [ARB_LOST] = | 168 | [ARB_LOST] = |
| 169 | "lost arbitration", | 169 | "lost arbitration", |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| @@ -394,7 +394,8 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) | |||
| 394 | intr_mask = DW_IC_INTR_DEFAULT_MASK; | 394 | intr_mask = DW_IC_INTR_DEFAULT_MASK; |
| 395 | 395 | ||
| 396 | for (; dev->msg_write_idx < dev->msgs_num; dev->msg_write_idx++) { | 396 | for (; dev->msg_write_idx < dev->msgs_num; dev->msg_write_idx++) { |
| 397 | /* if target address has changed, we need to | 397 | /* |
| 398 | * if target address has changed, we need to | ||
| 398 | * reprogram the target address in the i2c | 399 | * reprogram the target address in the i2c |
| 399 | * adapter when we are done with this transfer | 400 | * adapter when we are done with this transfer |
| 400 | */ | 401 | */ |
