diff options
| author | David Howells <dhowells@redhat.com> | 2015-06-03 08:34:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-06-10 11:11:38 -0300 |
| commit | 0f20baad24f97c3390ae869661408bb3ee12764e (patch) | |
| tree | 61b5d4c78c08dfa641f2f98f81dce3c83a6acc09 /drivers/media | |
| parent | 3366cd5d72c664aa5e447f41ed2f7dac69f6a94e (diff) | |
| download | linux-0f20baad24f97c3390ae869661408bb3ee12764e.tar.gz | |
[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb-frontends/ts2020.c | 3 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/ts2020.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c index 80ae0397b05c..8c997d064beb 100644 --- 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 37797244774d..002bc0ac1603 100644 --- 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 |