aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2014-08-03 22:26:27 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-21 19:05:20 -0400
commitbdb32655f2fa5055cad1145dac17b76243d20a02 (patch)
treebaec11fbb861b9769208404bfb5f55527c20fdbb
parent0e584cc29567f9ad248420f9cbd35c0ae3b5e821 (diff)
[media] tda18212: clean logging
There is no need to print module name nor function name as those are done by kernel logging system when dev_xxx logging is used and driver is proper I2C driver. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/tuners/tda18212.c35
1 files changed, 18 insertions, 17 deletions
diff --git a/drivers/media/tuners/tda18212.c b/drivers/media/tuners/tda18212.c
index 659787b805a3..5d1d78595c86 100644
--- a/drivers/media/tuners/tda18212.c
+++ b/drivers/media/tuners/tda18212.c
@@ -47,8 +47,8 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
47 47
48 if (1 + len > sizeof(buf)) { 48 if (1 + len > sizeof(buf)) {
49 dev_warn(&priv->client->dev, 49 dev_warn(&priv->client->dev,
50 "%s: i2c wr reg=%04x: len=%d is too big!\n", 50 "i2c wr reg=%04x: len=%d is too big!\n",
51 KBUILD_MODNAME, reg, len); 51 reg, len);
52 return -EINVAL; 52 return -EINVAL;
53 } 53 }
54 54
@@ -59,8 +59,9 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
59 if (ret == 1) { 59 if (ret == 1) {
60 ret = 0; 60 ret = 0;
61 } else { 61 } else {
62 dev_warn(&priv->client->dev, "%s: i2c wr failed=%d reg=%02x len=%d\n", 62 dev_warn(&priv->client->dev,
63 KBUILD_MODNAME, ret, reg, len); 63 "i2c wr failed=%d reg=%02x len=%d\n",
64 ret, reg, len);
64 ret = -EREMOTEIO; 65 ret = -EREMOTEIO;
65 } 66 }
66 return ret; 67 return ret;
@@ -88,8 +89,8 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
88 89
89 if (len > sizeof(buf)) { 90 if (len > sizeof(buf)) {
90 dev_warn(&priv->client->dev, 91 dev_warn(&priv->client->dev,
91 "%s: i2c rd reg=%04x: len=%d is too big!\n", 92 "i2c rd reg=%04x: len=%d is too big!\n",
92 KBUILD_MODNAME, reg, len); 93 reg, len);
93 return -EINVAL; 94 return -EINVAL;
94 } 95 }
95 96
@@ -98,8 +99,9 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
98 memcpy(val, buf, len); 99 memcpy(val, buf, len);
99 ret = 0; 100 ret = 0;
100 } else { 101 } else {
101 dev_warn(&priv->client->dev, "%s: i2c rd failed=%d reg=%02x len=%d\n", 102 dev_warn(&priv->client->dev,
102 KBUILD_MODNAME, ret, reg, len); 103 "i2c rd failed=%d reg=%02x len=%d\n",
104 ret, reg, len);
103 ret = -EREMOTEIO; 105 ret = -EREMOTEIO;
104 } 106 }
105 107
@@ -167,8 +169,8 @@ static int tda18212_set_params(struct dvb_frontend *fe)
167 }; 169 };
168 170
169 dev_dbg(&priv->client->dev, 171 dev_dbg(&priv->client->dev,
170 "%s: delivery_system=%d frequency=%d bandwidth_hz=%d\n", 172 "delivery_system=%d frequency=%d bandwidth_hz=%d\n",
171 __func__, c->delivery_system, c->frequency, 173 c->delivery_system, c->frequency,
172 c->bandwidth_hz); 174 c->bandwidth_hz);
173 175
174 if (fe->ops.i2c_gate_ctrl) 176 if (fe->ops.i2c_gate_ctrl)
@@ -266,7 +268,7 @@ exit:
266 return ret; 268 return ret;
267 269
268error: 270error:
269 dev_dbg(&priv->client->dev, "%s: failed=%d\n", __func__, ret); 271 dev_dbg(&priv->client->dev, "failed=%d\n", ret);
270 goto exit; 272 goto exit;
271} 273}
272 274
@@ -305,7 +307,7 @@ static int tda18212_probe(struct i2c_client *client,
305 priv = kzalloc(sizeof(*priv), GFP_KERNEL); 307 priv = kzalloc(sizeof(*priv), GFP_KERNEL);
306 if (!priv) { 308 if (!priv) {
307 ret = -ENOMEM; 309 ret = -ENOMEM;
308 dev_err(&client->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME); 310 dev_err(&client->dev, "kzalloc() failed\n");
309 goto err; 311 goto err;
310 } 312 }
311 313
@@ -317,7 +319,7 @@ static int tda18212_probe(struct i2c_client *client,
317 fe->ops.i2c_gate_ctrl(fe, 1); /* open I2C-gate */ 319 fe->ops.i2c_gate_ctrl(fe, 1); /* open I2C-gate */
318 320
319 ret = tda18212_rd_reg(priv, 0x00, &chip_id); 321 ret = tda18212_rd_reg(priv, 0x00, &chip_id);
320 dev_dbg(&priv->client->dev, "%s: chip_id=%02x\n", __func__, chip_id); 322 dev_dbg(&priv->client->dev, "chip_id=%02x\n", chip_id);
321 323
322 if (fe->ops.i2c_gate_ctrl) 324 if (fe->ops.i2c_gate_ctrl)
323 fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */ 325 fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */
@@ -338,8 +340,7 @@ static int tda18212_probe(struct i2c_client *client,
338 } 340 }
339 341
340 dev_info(&priv->client->dev, 342 dev_info(&priv->client->dev,
341 "%s: NXP TDA18212HN/%s successfully identified\n", 343 "NXP TDA18212HN/%s successfully identified\n", version);
342 KBUILD_MODNAME, version);
343 344
344 fe->tuner_priv = priv; 345 fe->tuner_priv = priv;
345 memcpy(&fe->ops.tuner_ops, &tda18212_tuner_ops, 346 memcpy(&fe->ops.tuner_ops, &tda18212_tuner_ops,
@@ -348,7 +349,7 @@ static int tda18212_probe(struct i2c_client *client,
348 349
349 return 0; 350 return 0;
350err: 351err:
351 dev_dbg(&client->dev, "%s: failed=%d\n", __func__, ret); 352 dev_dbg(&client->dev, "failed=%d\n", ret);
352 kfree(priv); 353 kfree(priv);
353 return ret; 354 return ret;
354} 355}
@@ -358,7 +359,7 @@ static int tda18212_remove(struct i2c_client *client)
358 struct tda18212_priv *priv = i2c_get_clientdata(client); 359 struct tda18212_priv *priv = i2c_get_clientdata(client);
359 struct dvb_frontend *fe = priv->cfg.fe; 360 struct dvb_frontend *fe = priv->cfg.fe;
360 361
361 dev_dbg(&client->dev, "%s:\n", __func__); 362 dev_dbg(&client->dev, "\n");
362 363
363 memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops)); 364 memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
364 fe->tuner_priv = NULL; 365 fe->tuner_priv = NULL;