diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2014-01-25 12:14:46 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-02-13 14:41:40 -0500 |
commit | 704d63f59900968b9b5ae92549c49db0686b87e3 (patch) | |
tree | b94a47f5b7da2b46b72e6094e64d06433afbc0ec /drivers/gpu | |
parent | fb7544d7732f780df989fabf31c5852be953daad (diff) |
drm/i2c: tda998x: code cleanup
This patch:
- replaces ARRAY_SIZE() by sizeof() when a number of bytes is needed,
- adds a linefeed in an error message and
- removes an useless variable setting.
Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i2c/tda998x_drv.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 19f418246e7b..c5c9de536346 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c | |||
@@ -336,7 +336,7 @@ cec_write(struct tda998x_priv *priv, uint16_t addr, uint8_t val) | |||
336 | uint8_t buf[] = {addr, val}; | 336 | uint8_t buf[] = {addr, val}; |
337 | int ret; | 337 | int ret; |
338 | 338 | ||
339 | ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); | 339 | ret = i2c_master_send(client, buf, sizeof(buf)); |
340 | if (ret < 0) | 340 | if (ret < 0) |
341 | dev_err(&client->dev, "Error %d writing to cec:0x%x\n", ret, addr); | 341 | dev_err(&client->dev, "Error %d writing to cec:0x%x\n", ret, addr); |
342 | } | 342 | } |
@@ -373,7 +373,8 @@ set_page(struct tda998x_priv *priv, uint16_t reg) | |||
373 | }; | 373 | }; |
374 | int ret = i2c_master_send(client, buf, sizeof(buf)); | 374 | int ret = i2c_master_send(client, buf, sizeof(buf)); |
375 | if (ret < 0) { | 375 | if (ret < 0) { |
376 | dev_err(&client->dev, "Error %d writing to REG_CURPAGE\n", ret); | 376 | dev_err(&client->dev, "setpage %04x err %d\n", |
377 | reg, ret); | ||
377 | return ret; | 378 | return ret; |
378 | } | 379 | } |
379 | 380 | ||
@@ -450,7 +451,7 @@ reg_write(struct tda998x_priv *priv, uint16_t reg, uint8_t val) | |||
450 | if (ret < 0) | 451 | if (ret < 0) |
451 | return; | 452 | return; |
452 | 453 | ||
453 | ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); | 454 | ret = i2c_master_send(client, buf, sizeof(buf)); |
454 | if (ret < 0) | 455 | if (ret < 0) |
455 | dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); | 456 | dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); |
456 | } | 457 | } |
@@ -466,7 +467,7 @@ reg_write16(struct tda998x_priv *priv, uint16_t reg, uint16_t val) | |||
466 | if (ret < 0) | 467 | if (ret < 0) |
467 | return; | 468 | return; |
468 | 469 | ||
469 | ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); | 470 | ret = i2c_master_send(client, buf, sizeof(buf)); |
470 | if (ret < 0) | 471 | if (ret < 0) |
471 | dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); | 472 | dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); |
472 | } | 473 | } |
@@ -1014,7 +1015,7 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk) | |||
1014 | 1015 | ||
1015 | ret = reg_read_range(priv, REG_EDID_DATA_0, buf, EDID_LENGTH); | 1016 | ret = reg_read_range(priv, REG_EDID_DATA_0, buf, EDID_LENGTH); |
1016 | if (ret != EDID_LENGTH) { | 1017 | if (ret != EDID_LENGTH) { |
1017 | dev_err(encoder->dev->dev, "failed to read edid block %d: %d", | 1018 | dev_err(encoder->dev->dev, "failed to read edid block %d: %d\n", |
1018 | blk, ret); | 1019 | blk, ret); |
1019 | return ret; | 1020 | return ret; |
1020 | } | 1021 | } |
@@ -1028,7 +1029,7 @@ static uint8_t * | |||
1028 | do_get_edid(struct drm_encoder *encoder) | 1029 | do_get_edid(struct drm_encoder *encoder) |
1029 | { | 1030 | { |
1030 | struct tda998x_priv *priv = to_tda998x_priv(encoder); | 1031 | struct tda998x_priv *priv = to_tda998x_priv(encoder); |
1031 | int j = 0, valid_extensions = 0; | 1032 | int j, valid_extensions = 0; |
1032 | uint8_t *block, *new; | 1033 | uint8_t *block, *new; |
1033 | bool print_bad_edid = drm_debug & DRM_UT_KMS; | 1034 | bool print_bad_edid = drm_debug & DRM_UT_KMS; |
1034 | 1035 | ||