Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 331065
b: refs/heads/master
c: 86ad0f1
h: refs/heads/master
i:
  331063: ea21463
v: v3
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Sep 23, 2012
1 parent 5f1266b commit 9e98c64
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a44850df5a2776f7785abc95051a161e39f8e541
refs/heads/master: 86ad0f1dd72b39159065fdf089afe0913b9bef41
46 changes: 24 additions & 22 deletions trunk/drivers/media/dvb-frontends/rtl2830.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@

#include "rtl2830_priv.h"

int rtl2830_debug;
module_param_named(debug, rtl2830_debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");

/* write multiple hardware registers */
static int rtl2830_wr(struct rtl2830_priv *priv, u8 reg, u8 *val, int len)
{
Expand All @@ -52,7 +48,8 @@ static int rtl2830_wr(struct rtl2830_priv *priv, u8 reg, u8 *val, int len)
if (ret == 1) {
ret = 0;
} else {
warn("i2c wr failed=%d reg=%02x len=%d", ret, reg, len);
dev_warn(&priv->i2c->dev, "%s: i2c wr failed=%d reg=%02x " \
"len=%d\n", KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO;
}
return ret;
Expand Down Expand Up @@ -80,7 +77,8 @@ static int rtl2830_rd(struct rtl2830_priv *priv, u8 reg, u8 *val, int len)
if (ret == 2) {
ret = 0;
} else {
warn("i2c rd failed=%d reg=%02x len=%d", ret, reg, len);
dev_warn(&priv->i2c->dev, "%s: i2c rd failed=%d reg=%02x " \
"len=%d\n", KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO;
}
return ret;
Expand Down Expand Up @@ -247,7 +245,7 @@ static int rtl2830_init(struct dvb_frontend *fe)
num = div_u64(num, priv->cfg.xtal);
num = -num;
if_ctl = num & 0x3fffff;
dbg("%s: if_ctl=%08x", __func__, if_ctl);
dev_dbg(&priv->i2c->dev, "%s: if_ctl=%08x\n", __func__, if_ctl);

ret = rtl2830_rd_reg_mask(priv, 0x119, &tmp, 0xc0); /* b[7:6] */
if (ret)
Expand Down Expand Up @@ -277,7 +275,7 @@ static int rtl2830_init(struct dvb_frontend *fe)

return ret;
err:
dbg("%s: failed=%d", __func__, ret);
dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand Down Expand Up @@ -328,8 +326,9 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe)
};


dbg("%s: frequency=%d bandwidth_hz=%d inversion=%d", __func__,
c->frequency, c->bandwidth_hz, c->inversion);
dev_dbg(&priv->i2c->dev,
"%s: frequency=%d bandwidth_hz=%d inversion=%d\n",
__func__, c->frequency, c->bandwidth_hz, c->inversion);

/* program tuner */
if (fe->ops.tuner_ops.set_params)
Expand All @@ -346,7 +345,7 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe)
i = 2;
break;
default:
dbg("invalid bandwidth");
dev_dbg(&priv->i2c->dev, "%s: invalid bandwidth\n", __func__);
return -EINVAL;
}

Expand All @@ -370,7 +369,7 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe)

return ret;
err:
dbg("%s: failed=%d", __func__, ret);
dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand All @@ -392,7 +391,7 @@ static int rtl2830_get_frontend(struct dvb_frontend *fe)
if (ret)
goto err;

dbg("%s: TPS=%*ph", __func__, 3, buf);
dev_dbg(&priv->i2c->dev, "%s: TPS=%*ph\n", __func__, 3, buf);

switch ((buf[0] >> 2) & 3) {
case 0:
Expand Down Expand Up @@ -482,7 +481,7 @@ static int rtl2830_get_frontend(struct dvb_frontend *fe)

return 0;
err:
dbg("%s: failed=%d", __func__, ret);
dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand Down Expand Up @@ -510,7 +509,7 @@ static int rtl2830_read_status(struct dvb_frontend *fe, fe_status_t *status)

return ret;
err:
dbg("%s: failed=%d", __func__, ret);
dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand Down Expand Up @@ -559,7 +558,7 @@ static int rtl2830_read_snr(struct dvb_frontend *fe, u16 *snr)

return 0;
err:
dbg("%s: failed=%d", __func__, ret);
dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand All @@ -580,7 +579,7 @@ static int rtl2830_read_ber(struct dvb_frontend *fe, u32 *ber)

return 0;
err:
dbg("%s: failed=%d", __func__, ret);
dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand Down Expand Up @@ -616,7 +615,7 @@ static int rtl2830_read_signal_strength(struct dvb_frontend *fe, u16 *strength)

return 0;
err:
dbg("%s: failed=%d", __func__, ret);
dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand All @@ -640,11 +639,12 @@ static int rtl2830_tuner_i2c_xfer(struct i2c_adapter *i2c_adap,

ret = i2c_transfer(priv->i2c, msg, num);
if (ret < 0)
warn("tuner i2c failed=%d", ret);
dev_warn(&priv->i2c->dev, "%s: tuner i2c failed=%d\n",
KBUILD_MODNAME, ret);

return ret;
err:
dbg("%s: failed=%d", __func__, ret);
dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand Down Expand Up @@ -700,15 +700,17 @@ struct dvb_frontend *rtl2830_attach(const struct rtl2830_config *cfg,
priv->tuner_i2c_adapter.algo_data = NULL;
i2c_set_adapdata(&priv->tuner_i2c_adapter, priv);
if (i2c_add_adapter(&priv->tuner_i2c_adapter) < 0) {
err("tuner I2C bus could not be initialized");
dev_err(&i2c->dev,
"%s: tuner i2c bus could not be initialized\n",
KBUILD_MODNAME);
goto err;
}

priv->sleeping = true;

return &priv->fe;
err:
dbg("%s: failed=%d", __func__, ret);
dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret);
kfree(priv);
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb-frontends/rtl2830.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static inline struct dvb_frontend *rtl2830_attach(
struct i2c_adapter *i2c
)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
pr_warn("%s: driver disabled by Kconfig\n", __func__);
return NULL;
}

Expand Down
13 changes: 0 additions & 13 deletions trunk/drivers/media/dvb-frontends/rtl2830_priv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,6 @@
#include "dvb_math.h"
#include "rtl2830.h"

#define LOG_PREFIX "rtl2830"

#undef dbg
#define dbg(f, arg...) \
if (rtl2830_debug) \
printk(KERN_INFO LOG_PREFIX": " f "\n" , ## arg)
#undef err
#define err(f, arg...) printk(KERN_ERR LOG_PREFIX": " f "\n" , ## arg)
#undef info
#define info(f, arg...) printk(KERN_INFO LOG_PREFIX": " f "\n" , ## arg)
#undef warn
#define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg)

struct rtl2830_priv {
struct i2c_adapter *i2c;
struct dvb_frontend fe;
Expand Down

0 comments on commit 9e98c64

Please sign in to comment.