[media] ts2020: Copy loop_through from the config to the internal data

Copy the loop_through setting from the ts2020_config struct to the internal
ts2020_priv struct so that it can actually be used.

Whilst we're at it, group the bitfields together in the same order in both
structs so that the compiler has a good chance to copy them in one go.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index 80ae0397b05c5cc66c1ffcd5312ed13d9b7e2900..8c997d064beb176a076250199660b231ee641743 100644 (file)
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -37,6 +37,7 @@ struct ts2020_priv {
        /* i2c details */
        struct i2c_adapter *i2c;
        int i2c_address;
+       bool loop_through:1;
        u8 clk_out:2;
        u8 clk_out_div:5;
        u32 frequency_div; /* LO output divider switch frequency */
@@ -44,7 +45,6 @@ struct ts2020_priv {
 #define TS2020_M88TS2020 0
 #define TS2020_M88TS2022 1
        u8 tuner;
-       u8 loop_through:1;
 };
 
 struct ts2020_reg_val {
@@ -582,6 +582,7 @@ static int ts2020_probe(struct i2c_client *client,
 
        dev->i2c = client->adapter;
        dev->i2c_address = client->addr;
+       dev->loop_through = pdata->loop_through;
        dev->clk_out = pdata->clk_out;
        dev->clk_out_div = pdata->clk_out_div;
        dev->frequency_div = pdata->frequency_div;

diff --git a/drivers/media/dvb-frontends/ts2020.h b/drivers/media/dvb-frontends/ts2020.h
index 37797244774d5e917c3b14d3608b5cbe4e908560..002bc0ac1603f7fac744e635fcbc56d1f5505317 100644 (file)
--- a/drivers/media/dvb-frontends/ts2020.h
+++ b/drivers/media/dvb-frontends/ts2020.h
@@ -32,7 +32,7 @@ struct ts2020_config {
        /*
         * RF loop-through
         */
-       u8 loop_through:1;
+       bool loop_through:1;
 
        /*
         * clock output