diff options
author | Antti Palosaari <crope@iki.fi> | 2013-10-12 23:06:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-05 13:38:01 -0500 |
commit | 3ca2418d707c9eeafa76f6096eb8e06d1cfa8bdb (patch) | |
tree | 89247c60d953ff3ab30660dea313b186afd513c8 /drivers/media/dvb-frontends/rtl2832.c | |
parent | 5791eee2647ff358e6cb11b2830c62a92e2674c7 (diff) |
[media] rtl2832: style changes and minor cleanup
Most of those were reported by checkpatch.pl...
debug module parameter is not used anywhere so remove it.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/dvb-frontends/rtl2832.c')
-rw-r--r-- | drivers/media/dvb-frontends/rtl2832.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c index 61d4ecbfd180..00e63b9f104d 100644 --- a/drivers/media/dvb-frontends/rtl2832.c +++ b/drivers/media/dvb-frontends/rtl2832.c | |||
@@ -24,11 +24,6 @@ | |||
24 | 24 | ||
25 | /* Max transfer size done by I2C transfer functions */ | 25 | /* Max transfer size done by I2C transfer functions */ |
26 | #define MAX_XFER_SIZE 64 | 26 | #define MAX_XFER_SIZE 64 |
27 | |||
28 | int rtl2832_debug; | ||
29 | module_param_named(debug, rtl2832_debug, int, 0644); | ||
30 | MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); | ||
31 | |||
32 | #define REG_MASK(b) (BIT(b + 1) - 1) | 27 | #define REG_MASK(b) (BIT(b + 1) - 1) |
33 | 28 | ||
34 | static const struct rtl2832_reg_entry registers[] = { | 29 | static const struct rtl2832_reg_entry registers[] = { |
@@ -189,8 +184,9 @@ static int rtl2832_wr(struct rtl2832_priv *priv, u8 reg, u8 *val, int len) | |||
189 | if (ret == 1) { | 184 | if (ret == 1) { |
190 | ret = 0; | 185 | ret = 0; |
191 | } else { | 186 | } else { |
192 | dev_warn(&priv->i2c->dev, "%s: i2c wr failed=%d reg=%02x " \ | 187 | dev_warn(&priv->i2c->dev, |
193 | "len=%d\n", KBUILD_MODNAME, ret, reg, len); | 188 | "%s: i2c wr failed=%d reg=%02x len=%d\n", |
189 | KBUILD_MODNAME, ret, reg, len); | ||
194 | ret = -EREMOTEIO; | 190 | ret = -EREMOTEIO; |
195 | } | 191 | } |
196 | return ret; | 192 | return ret; |
@@ -218,8 +214,9 @@ static int rtl2832_rd(struct rtl2832_priv *priv, u8 reg, u8 *val, int len) | |||
218 | if (ret == 2) { | 214 | if (ret == 2) { |
219 | ret = 0; | 215 | ret = 0; |
220 | } else { | 216 | } else { |
221 | dev_warn(&priv->i2c->dev, "%s: i2c rd failed=%d reg=%02x " \ | 217 | dev_warn(&priv->i2c->dev, |
222 | "len=%d\n", KBUILD_MODNAME, ret, reg, len); | 218 | "%s: i2c rd failed=%d reg=%02x len=%d\n", |
219 | KBUILD_MODNAME, ret, reg, len); | ||
223 | ret = -EREMOTEIO; | 220 | ret = -EREMOTEIO; |
224 | } | 221 | } |
225 | return ret; | 222 | return ret; |
@@ -417,7 +414,7 @@ static int rtl2832_set_if(struct dvb_frontend *fe, u32 if_freq) | |||
417 | 414 | ||
418 | ret = rtl2832_wr_demod_reg(priv, DVBT_PSET_IFFREQ, pset_iffreq); | 415 | ret = rtl2832_wr_demod_reg(priv, DVBT_PSET_IFFREQ, pset_iffreq); |
419 | 416 | ||
420 | return (ret); | 417 | return ret; |
421 | } | 418 | } |
422 | 419 | ||
423 | static int rtl2832_init(struct dvb_frontend *fe) | 420 | static int rtl2832_init(struct dvb_frontend *fe) |
@@ -516,7 +513,8 @@ static int rtl2832_init(struct dvb_frontend *fe) | |||
516 | 513 | ||
517 | /* | 514 | /* |
518 | * r820t NIM code does a software reset here at the demod - | 515 | * r820t NIM code does a software reset here at the demod - |
519 | * may not be needed, as there's already a software reset at set_params() | 516 | * may not be needed, as there's already a software reset at |
517 | * set_params() | ||
520 | */ | 518 | */ |
521 | #if 1 | 519 | #if 1 |
522 | /* soft reset */ | 520 | /* soft reset */ |
@@ -593,9 +591,9 @@ static int rtl2832_set_frontend(struct dvb_frontend *fe) | |||
593 | }; | 591 | }; |
594 | 592 | ||
595 | 593 | ||
596 | dev_dbg(&priv->i2c->dev, "%s: frequency=%d bandwidth_hz=%d " \ | 594 | dev_dbg(&priv->i2c->dev, |
597 | "inversion=%d\n", __func__, c->frequency, | 595 | "%s: frequency=%d bandwidth_hz=%d inversion=%d\n", |
598 | c->bandwidth_hz, c->inversion); | 596 | __func__, c->frequency, c->bandwidth_hz, c->inversion); |
599 | 597 | ||
600 | /* program tuner */ | 598 | /* program tuner */ |
601 | if (fe->ops.tuner_ops.set_params) | 599 | if (fe->ops.tuner_ops.set_params) |