Commit 7cc39328 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab

[media] rtl2830: fix logging

Pass correct device for dev_foo() logging in order to print logs
correctly.
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1f153c4d
...@@ -46,9 +46,8 @@ static int rtl2830_wr(struct i2c_client *client, u8 reg, const u8 *val, int len) ...@@ -46,9 +46,8 @@ static int rtl2830_wr(struct i2c_client *client, u8 reg, const u8 *val, int len)
}; };
if (1 + len > sizeof(buf)) { if (1 + len > sizeof(buf)) {
dev_warn(&dev->i2c->dev, dev_warn(&client->dev, "i2c wr reg=%04x: len=%d is too big!\n",
"%s: i2c wr reg=%04x: len=%d is too big!\n", reg, len);
KBUILD_MODNAME, reg, len);
return -EINVAL; return -EINVAL;
} }
...@@ -59,8 +58,8 @@ static int rtl2830_wr(struct i2c_client *client, u8 reg, const u8 *val, int len) ...@@ -59,8 +58,8 @@ static int rtl2830_wr(struct i2c_client *client, u8 reg, const u8 *val, int len)
if (ret == 1) { if (ret == 1) {
ret = 0; ret = 0;
} else { } else {
dev_warn(&dev->i2c->dev, "%s: i2c wr failed=%d reg=%02x " \ dev_warn(&client->dev, "i2c wr failed=%d reg=%02x len=%d\n",
"len=%d\n", KBUILD_MODNAME, ret, reg, len); ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
return ret; return ret;
...@@ -89,8 +88,8 @@ static int rtl2830_rd(struct i2c_client *client, u8 reg, u8 *val, int len) ...@@ -89,8 +88,8 @@ static int rtl2830_rd(struct i2c_client *client, u8 reg, u8 *val, int len)
if (ret == 2) { if (ret == 2) {
ret = 0; ret = 0;
} else { } else {
dev_warn(&dev->i2c->dev, "%s: i2c rd failed=%d reg=%02x " \ dev_warn(&client->dev, "i2c rd failed=%d reg=%02x len=%d\n",
"len=%d\n", KBUILD_MODNAME, ret, reg, len); ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
return ret; return ret;
...@@ -259,7 +258,7 @@ static int rtl2830_init(struct dvb_frontend *fe) ...@@ -259,7 +258,7 @@ static int rtl2830_init(struct dvb_frontend *fe)
return ret; return ret;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
...@@ -314,9 +313,8 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe) ...@@ -314,9 +313,8 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe)
{0xae, 0xba, 0xf3, 0x26, 0x66, 0x64}, /* 8 MHz */ {0xae, 0xba, 0xf3, 0x26, 0x66, 0x64}, /* 8 MHz */
}; };
dev_dbg(&dev->i2c->dev, dev_dbg(&client->dev, "frequency=%u bandwidth_hz=%u inversion=%u\n",
"%s: frequency=%d bandwidth_hz=%d inversion=%d\n", c->frequency, c->bandwidth_hz, c->inversion);
__func__, c->frequency, c->bandwidth_hz, c->inversion);
/* program tuner */ /* program tuner */
if (fe->ops.tuner_ops.set_params) if (fe->ops.tuner_ops.set_params)
...@@ -333,7 +331,8 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe) ...@@ -333,7 +331,8 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe)
i = 2; i = 2;
break; break;
default: default:
dev_dbg(&dev->i2c->dev, "%s: invalid bandwidth\n", __func__); dev_err(&client->dev, "invalid bandwidth_hz %u\n",
c->bandwidth_hz);
return -EINVAL; return -EINVAL;
} }
...@@ -355,8 +354,8 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe) ...@@ -355,8 +354,8 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe)
num = div_u64(num, dev->cfg.xtal); num = div_u64(num, dev->cfg.xtal);
num = -num; num = -num;
if_ctl = num & 0x3fffff; if_ctl = num & 0x3fffff;
dev_dbg(&dev->i2c->dev, "%s: if_frequency=%d if_ctl=%08x\n", dev_dbg(&client->dev, "if_frequency=%d if_ctl=%08x\n",
__func__, if_frequency, if_ctl); if_frequency, if_ctl);
ret = rtl2830_rd_reg_mask(client, 0x119, &tmp, 0xc0); /* b[7:6] */ ret = rtl2830_rd_reg_mask(client, 0x119, &tmp, 0xc0); /* b[7:6] */
if (ret) if (ret)
...@@ -387,7 +386,7 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe) ...@@ -387,7 +386,7 @@ static int rtl2830_set_frontend(struct dvb_frontend *fe)
return ret; return ret;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
...@@ -410,7 +409,7 @@ static int rtl2830_get_frontend(struct dvb_frontend *fe) ...@@ -410,7 +409,7 @@ static int rtl2830_get_frontend(struct dvb_frontend *fe)
if (ret) if (ret)
goto err; goto err;
dev_dbg(&dev->i2c->dev, "%s: TPS=%*ph\n", __func__, 3, buf); dev_dbg(&client->dev, "TPS=%*ph\n", 3, buf);
switch ((buf[0] >> 2) & 3) { switch ((buf[0] >> 2) & 3) {
case 0: case 0:
...@@ -500,7 +499,7 @@ static int rtl2830_get_frontend(struct dvb_frontend *fe) ...@@ -500,7 +499,7 @@ static int rtl2830_get_frontend(struct dvb_frontend *fe)
return 0; return 0;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
...@@ -529,7 +528,7 @@ static int rtl2830_read_status(struct dvb_frontend *fe, fe_status_t *status) ...@@ -529,7 +528,7 @@ static int rtl2830_read_status(struct dvb_frontend *fe, fe_status_t *status)
return ret; return ret;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
...@@ -579,7 +578,7 @@ static int rtl2830_read_snr(struct dvb_frontend *fe, u16 *snr) ...@@ -579,7 +578,7 @@ static int rtl2830_read_snr(struct dvb_frontend *fe, u16 *snr)
return 0; return 0;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
...@@ -601,7 +600,7 @@ static int rtl2830_read_ber(struct dvb_frontend *fe, u32 *ber) ...@@ -601,7 +600,7 @@ static int rtl2830_read_ber(struct dvb_frontend *fe, u32 *ber)
return 0; return 0;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
...@@ -638,7 +637,7 @@ static int rtl2830_read_signal_strength(struct dvb_frontend *fe, u16 *strength) ...@@ -638,7 +637,7 @@ static int rtl2830_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
return 0; return 0;
err: err:
dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
...@@ -728,7 +727,7 @@ static int rtl2830_select(struct i2c_adapter *adap, void *mux_priv, u32 chan_id) ...@@ -728,7 +727,7 @@ static int rtl2830_select(struct i2c_adapter *adap, void *mux_priv, u32 chan_id)
return 0; return 0;
err: err:
dev_dbg(&client->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment