media: si2168: Refactor command setup code

Use cmd_init() to fill a struct si2168_cmd command.

Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index a574f1d..14b93a7 100644 (file)
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -11,6 +11,13 @@
 
 static const struct dvb_frontend_ops si2168_ops;
 
+static void cmd_init(struct si2168_cmd *cmd, const u8 *buf, int wlen, int rlen)
+{
+       memcpy(cmd->args, buf, wlen);
+       cmd->wlen = wlen;
+       cmd->rlen = rlen;
+}
+
 /* execute firmware command */
 static int si2168_cmd_execute(struct i2c_client *client, struct si2168_cmd *cmd)
 {
@@ -84,15 +91,13 @@ static int si2168_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
 
        /* set manual value */
        if (dev->ts_mode & SI2168_TS_CLK_MANUAL) {
-               memcpy(cmd.args, "\x14\x00\x0d\x10\xe8\x03", 6);
-               cmd.wlen = 6;
-               cmd.rlen = 4;
+               cmd_init(&cmd, "\x14\x00\x0d\x10\xe8\x03", 6, 4);
                ret = si2168_cmd_execute(client, &cmd);
                if (ret)
                        return ret;
        }
        /* set TS_MODE property */
-       memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6);
+       cmd_init(&cmd, "\x14\x00\x01\x10\x10\x00", 6, 4);
        if (dev->ts_mode & SI2168_TS_CLK_MANUAL)
                cmd.args[4] = SI2168_TS_CLK_MANUAL;
        if (acquire)
@@ -101,8 +106,6 @@ static int si2168_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
                cmd.args[4] |= SI2168_TS_TRISTATE;
        if (dev->ts_clock_gapped)
                cmd.args[4] |= 0x40;
-       cmd.wlen = 6;
-       cmd.rlen = 4;
        ret = si2168_cmd_execute(client, &cmd);
 
        return ret;
@@ -126,19 +129,13 @@ static int si2168_read_status(struct dvb_frontend *fe, enum fe_status *status)
 
        switch (c->delivery_system) {
        case SYS_DVBT:
-               memcpy(cmd.args, "\xa0\x01", 2);
-               cmd.wlen = 2;
-               cmd.rlen = 13;
+               cmd_init(&cmd, "\xa0\x01", 2, 13);
                break;
        case SYS_DVBC_ANNEX_A:
-               memcpy(cmd.args, "\x90\x01", 2);
-               cmd.wlen = 2;
-               cmd.rlen = 9;
+               cmd_init(&cmd, "\x90\x01", 2, 9);
                break;
        case SYS_DVBT2:
-               memcpy(cmd.args, "\x50\x01", 2);
-               cmd.wlen = 2;
-               cmd.rlen = 14;
+               cmd_init(&cmd, "\x50\x01", 2, 14);
                break;
        default:
                ret = -EINVAL;
@@ -175,9 +172,7 @@ static int si2168_read_status(struct dvb_frontend *fe, enum fe_status *status)
 
        /* BER */
        if (*status & FE_HAS_VITERBI) {
-               memcpy(cmd.args, "\x82\x00", 2);
-               cmd.wlen = 2;
-               cmd.rlen = 3;
+               cmd_init(&cmd, "\x82\x00", 2, 3);
                ret = si2168_cmd_execute(client, &cmd);
                if (ret)
                        goto err;
@@ -208,9 +203,7 @@ static int si2168_read_status(struct dvb_frontend *fe, enum fe_status *status)
 
        /* UCB */
        if (*status & FE_HAS_SYNC) {
-               memcpy(cmd.args, "\x84\x01", 2);
-               cmd.wlen = 2;
-               cmd.rlen = 3;
+               cmd_init(&cmd, "\x84\x01", 2, 3);
                ret = si2168_cmd_execute(client, &cmd);
                if (ret)
                        goto err;
@@ -296,22 +289,18 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
                        goto err;
        }
 
-       memcpy(cmd.args, "\x88\x02\x02\x02\x02", 5);
-       cmd.wlen = 5;
-       cmd.rlen = 5;
+       cmd_init(&cmd, "\x88\x02\x02\x02\x02", 5, 5);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
        /* that has no big effect */
        if (c->delivery_system == SYS_DVBT)
-               memcpy(cmd.args, "\x89\x21\x06\x11\xff\x98", 6);
+               cmd_init(&cmd, "\x89\x21\x06\x11\xff\x98", 6, 3);
        else if (c->delivery_system == SYS_DVBC_ANNEX_A)
-               memcpy(cmd.args, "\x89\x21\x06\x11\x89\xf0", 6);
+               cmd_init(&cmd, "\x89\x21\x06\x11\x89\xf0", 6, 3);
        else if (c->delivery_system == SYS_DVBT2)
-               memcpy(cmd.args, "\x89\x21\x06\x11\x89\x20", 6);
-       cmd.wlen = 6;
-       cmd.rlen = 3;
+               cmd_init(&cmd, "\x89\x21\x06\x11\x89\x20", 6, 3);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
@@ -328,103 +317,77 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
                        goto err;
        }
 
-       memcpy(cmd.args, "\x51\x03", 2);
-       cmd.wlen = 2;
-       cmd.rlen = 12;
+       cmd_init(&cmd, "\x51\x03", 2, 12);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x12\x08\x04", 3);
-       cmd.wlen = 3;
-       cmd.rlen = 3;
+       cmd_init(&cmd, "\x12\x08\x04", 3, 3);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x14\x00\x0c\x10\x12\x00", 6);
-       cmd.wlen = 6;
-       cmd.rlen = 4;
+       cmd_init(&cmd, "\x14\x00\x0c\x10\x12\x00", 6, 4);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x14\x00\x06\x10\x24\x00", 6);
-       cmd.wlen = 6;
-       cmd.rlen = 4;
+       cmd_init(&cmd, "\x14\x00\x06\x10\x24\x00", 6, 4);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x14\x00\x07\x10\x00\x24", 6);
-       cmd.wlen = 6;
-       cmd.rlen = 4;
+       cmd_init(&cmd, "\x14\x00\x07\x10\x00\x24", 6, 4);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x14\x00\x0a\x10\x00\x00", 6);
+       cmd_init(&cmd, "\x14\x00\x0a\x10\x00\x00", 6, 4);
        cmd.args[4] = delivery_system | bandwidth;
        if (dev->spectral_inversion)
                cmd.args[5] |= 1;
-       cmd.wlen = 6;
-       cmd.rlen = 4;
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
        /* set DVB-C symbol rate */
        if (c->delivery_system == SYS_DVBC_ANNEX_A) {
-               memcpy(cmd.args, "\x14\x00\x02\x11", 4);
+               cmd_init(&cmd, "\x14\x00\x02\x11\x00\x00", 6, 4);
                cmd.args[4] = ((c->symbol_rate / 1000) >> 0) & 0xff;
                cmd.args[5] = ((c->symbol_rate / 1000) >> 8) & 0xff;
-               cmd.wlen = 6;
-               cmd.rlen = 4;
                ret = si2168_cmd_execute(client, &cmd);
                if (ret)
                        goto err;
        }
 
-       memcpy(cmd.args, "\x14\x00\x0f\x10\x10\x00", 6);
-       cmd.wlen = 6;
-       cmd.rlen = 4;
+       cmd_init(&cmd, "\x14\x00\x0f\x10\x10\x00", 6, 4);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x14\x00\x09\x10\xe3\x08", 6);
+       cmd_init(&cmd, "\x14\x00\x09\x10\xe3\x08", 6, 4);
        cmd.args[5] |= dev->ts_clock_inv ? 0x00 : 0x10;
-       cmd.wlen = 6;
-       cmd.rlen = 4;
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x14\x00\x08\x10\xd7\x05", 6);
+       cmd_init(&cmd, "\x14\x00\x08\x10\xd7\x05", 6, 4);
        cmd.args[5] |= dev->ts_clock_inv ? 0x00 : 0x10;
-       cmd.wlen = 6;
-       cmd.rlen = 4;
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x14\x00\x01\x12\x00\x00", 6);
-       cmd.wlen = 6;
-       cmd.rlen = 4;
+       cmd_init(&cmd, "\x14\x00\x01\x12\x00\x00", 6, 4);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x14\x00\x01\x03\x0c\x00", 6);
-       cmd.wlen = 6;
-       cmd.rlen = 4;
+       cmd_init(&cmd, "\x14\x00\x01\x03\x0c\x00", 6, 4);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
-       memcpy(cmd.args, "\x85", 1);
-       cmd.wlen = 1;
-       cmd.rlen = 1;
+       cmd_init(&cmd, "\x85", 1, 1);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
@@ -454,26 +417,21 @@ static int si2168_init(struct dvb_frontend *fe)
        dev_dbg(&client->dev, "\n");
 
        /* initialize */
-       memcpy(cmd.args, "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00", 13);
-       cmd.wlen = 13;
-       cmd.rlen = 0;
+       cmd_init(&cmd, "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00",
+                13, 0);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
        if (dev->warm) {
                /* resume */
-               memcpy(cmd.args, "\xc0\x06\x08\x0f\x00\x20\x21\x01", 8);
-               cmd.wlen = 8;
-               cmd.rlen = 1;
+               cmd_init(&cmd, "\xc0\x06\x08\x0f\x00\x20\x21\x01", 8, 1);
                ret = si2168_cmd_execute(client, &cmd);
                if (ret)
                        goto err;
 
                udelay(100);
-               memcpy(cmd.args, "\x85", 1);
-               cmd.wlen = 1;
-               cmd.rlen = 1;
+               cmd_init(&cmd, "\x85", 1, 1);
                ret = si2168_cmd_execute(client, &cmd);
                if (ret)
                        goto err;
@@ -482,9 +440,7 @@ static int si2168_init(struct dvb_frontend *fe)
        }
 
        /* power up */
-       memcpy(cmd.args, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8);
-       cmd.wlen = 8;
-       cmd.rlen = 1;
+       cmd_init(&cmd, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8, 1);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
@@ -522,9 +478,8 @@ static int si2168_init(struct dvb_frontend *fe)
                                ret = -EINVAL;
                                break;
                        }
-                       memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len);
-                       cmd.wlen = len;
-                       cmd.rlen = 1;
+                       cmd_init(&cmd, &fw->data[(fw->size - remaining) + 1],
+                                len, 1);
                        ret = si2168_cmd_execute(client, &cmd);
                        if (ret)
                                break;
@@ -532,10 +487,7 @@ static int si2168_init(struct dvb_frontend *fe)
        } else if (fw->size % 8 == 0) {
                /* firmware is in the old format */
                for (remaining = fw->size; remaining > 0; remaining -= 8) {
-                       len = 8;
-                       memcpy(cmd.args, &fw->data[fw->size - remaining], len);
-                       cmd.wlen = len;
-                       cmd.rlen = 1;
+                       cmd_init(&cmd, &fw->data[fw->size - remaining], 8, 1);
                        ret = si2168_cmd_execute(client, &cmd);
                        if (ret)
                                break;
@@ -552,17 +504,13 @@ static int si2168_init(struct dvb_frontend *fe)
 
        release_firmware(fw);
 
-       memcpy(cmd.args, "\x01\x01", 2);
-       cmd.wlen = 2;
-       cmd.rlen = 1;
+       cmd_init(&cmd, "\x01\x01", 2, 1);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
 
        /* query firmware version */
-       memcpy(cmd.args, "\x11", 1);
-       cmd.wlen = 1;
-       cmd.rlen = 10;
+       cmd_init(&cmd, "\x11", 1, 10);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
@@ -620,9 +568,7 @@ static int si2168_sleep(struct dvb_frontend *fe)
        if (dev->version > ('B' << 24 | 4 << 16 | 0 << 8 | 11 << 0))
                dev->warm = false;
 
-       memcpy(cmd.args, "\x13", 1);
-       cmd.wlen = 1;
-       cmd.rlen = 0;
+       cmd_init(&cmd, "\x13", 1, 0);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
@@ -648,9 +594,7 @@ static int si2168_select(struct i2c_mux_core *muxc, u32 chan)
        struct si2168_cmd cmd;
 
        /* open I2C gate */
-       memcpy(cmd.args, "\xc0\x0d\x01", 3);
-       cmd.wlen = 3;
-       cmd.rlen = 0;
+       cmd_init(&cmd, "\xc0\x0d\x01", 3, 0);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
@@ -668,9 +612,7 @@ static int si2168_deselect(struct i2c_mux_core *muxc, u32 chan)
        struct si2168_cmd cmd;
 
        /* close I2C gate */
-       memcpy(cmd.args, "\xc0\x0d\x00", 3);
-       cmd.wlen = 3;
-       cmd.rlen = 0;
+       cmd_init(&cmd, "\xc0\x0d\x00", 3, 0);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err;
@@ -741,25 +683,20 @@ static int si2168_probe(struct i2c_client *client,
        mutex_init(&dev->i2c_mutex);
 
        /* Initialize */
-       memcpy(cmd.args, "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00", 13);
-       cmd.wlen = 13;
-       cmd.rlen = 0;
+       cmd_init(&cmd, "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00",
+                13, 0);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err_kfree;
 
        /* Power up */
-       memcpy(cmd.args, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8);
-       cmd.wlen = 8;
-       cmd.rlen = 1;
+       cmd_init(&cmd, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8, 1);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err_kfree;
 
        /* Query chip revision */
-       memcpy(cmd.args, "\x02", 1);
-       cmd.wlen = 1;
-       cmd.rlen = 13;
+       cmd_init(&cmd, "\x02", 1, 13);
        ret = si2168_cmd_execute(client, &cmd);
        if (ret)
                goto err_kfree;