]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i2c: tda998x: code cleanup
authorJean-Francois Moine <moinejf@free.fr>
Sat, 25 Jan 2014 17:14:46 +0000 (18:14 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 13 Feb 2014 19:41:40 +0000 (19:41 +0000)
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>
drivers/gpu/drm/i2c/tda998x_drv.c

index 19f418246e7b775d287147b1f704282cc0b5be2c..c5c9de536346e083e2478b1efc64dd46b569669a 100644 (file)
@@ -336,7 +336,7 @@ cec_write(struct tda998x_priv *priv, uint16_t addr, uint8_t val)
        uint8_t buf[] = {addr, val};
        int ret;
 
-       ret = i2c_master_send(client, buf, ARRAY_SIZE(buf));
+       ret = i2c_master_send(client, buf, sizeof(buf));
        if (ret < 0)
                dev_err(&client->dev, "Error %d writing to cec:0x%x\n", ret, addr);
 }
@@ -373,7 +373,8 @@ set_page(struct tda998x_priv *priv, uint16_t reg)
                };
                int ret = i2c_master_send(client, buf, sizeof(buf));
                if (ret < 0) {
-                       dev_err(&client->dev, "Error %d writing to REG_CURPAGE\n", ret);
+                       dev_err(&client->dev, "setpage %04x err %d\n",
+                                       reg, ret);
                        return ret;
                }
 
@@ -450,7 +451,7 @@ reg_write(struct tda998x_priv *priv, uint16_t reg, uint8_t val)
        if (ret < 0)
                return;
 
-       ret = i2c_master_send(client, buf, ARRAY_SIZE(buf));
+       ret = i2c_master_send(client, buf, sizeof(buf));
        if (ret < 0)
                dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg);
 }
@@ -466,7 +467,7 @@ reg_write16(struct tda998x_priv *priv, uint16_t reg, uint16_t val)
        if (ret < 0)
                return;
 
-       ret = i2c_master_send(client, buf, ARRAY_SIZE(buf));
+       ret = i2c_master_send(client, buf, sizeof(buf));
        if (ret < 0)
                dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg);
 }
@@ -1014,7 +1015,7 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk)
 
        ret = reg_read_range(priv, REG_EDID_DATA_0, buf, EDID_LENGTH);
        if (ret != EDID_LENGTH) {
-               dev_err(encoder->dev->dev, "failed to read edid block %d: %d",
+               dev_err(encoder->dev->dev, "failed to read edid block %d: %d\n",
                                blk, ret);
                return ret;
        }
@@ -1028,7 +1029,7 @@ static uint8_t *
 do_get_edid(struct drm_encoder *encoder)
 {
        struct tda998x_priv *priv = to_tda998x_priv(encoder);
-       int j = 0, valid_extensions = 0;
+       int j, valid_extensions = 0;
        uint8_t *block, *new;
        bool print_bad_edid = drm_debug & DRM_UT_KMS;