diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-04-29 17:11:38 -0400 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2008-04-29 17:11:38 -0400 |
commit | 1842cc2eeb345c4eef069ffd46e95359fb37b4b5 (patch) | |
tree | 5f1f1bd76d31f9738e2d9f0ca2cd5a1c90ec327e /drivers/i2c/busses/i2c-sis5595.c | |
parent | 3578a0759ed2f0ea1f2409144e628dad4d748059 (diff) |
i2c-sis5595: Minor cleanups in sis5595_access
* Remove commented-out code.
* Use dev_warn instead of printk.
* Remove a legacy comment.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-sis5595.c')
-rw-r--r-- | drivers/i2c/busses/i2c-sis5595.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c index afaafe3ba382..9ca8f9155f95 100644 --- a/drivers/i2c/busses/i2c-sis5595.c +++ b/drivers/i2c/busses/i2c-sis5595.c | |||
@@ -316,14 +316,8 @@ static s32 sis5595_access(struct i2c_adapter *adap, u16 addr, | |||
316 | } | 316 | } |
317 | size = (size == I2C_SMBUS_PROC_CALL) ? SIS5595_PROC_CALL : SIS5595_WORD_DATA; | 317 | size = (size == I2C_SMBUS_PROC_CALL) ? SIS5595_PROC_CALL : SIS5595_WORD_DATA; |
318 | break; | 318 | break; |
319 | /* | ||
320 | case I2C_SMBUS_BLOCK_DATA: | ||
321 | printk(KERN_WARNING "sis5595.o: Block data not yet implemented!\n"); | ||
322 | return -1; | ||
323 | break; | ||
324 | */ | ||
325 | default: | 319 | default: |
326 | printk(KERN_WARNING "sis5595.o: Unsupported transaction %d\n", size); | 320 | dev_warn(&adap->dev, "Unsupported transaction %d\n", size); |
327 | return -1; | 321 | return -1; |
328 | } | 322 | } |
329 | 323 | ||
@@ -338,9 +332,7 @@ static s32 sis5595_access(struct i2c_adapter *adap, u16 addr, | |||
338 | 332 | ||
339 | 333 | ||
340 | switch (size) { | 334 | switch (size) { |
341 | case SIS5595_BYTE: /* Where is the result put? I assume here it is in | 335 | case SIS5595_BYTE: |
342 | SMB_DATA but it might just as well be in the | ||
343 | SMB_CMD. No clue in the docs */ | ||
344 | case SIS5595_BYTE_DATA: | 336 | case SIS5595_BYTE_DATA: |
345 | data->byte = sis5595_read(SMB_BYTE); | 337 | data->byte = sis5595_read(SMB_BYTE); |
346 | break; | 338 | break; |