[media] af9033: clean up logging
It uses I2C client so logging system prints module name
automatically. Function name is also added automatically, if it is
requested from dynamic debug by setting proper format.
Because of that, we could simplify logging in our driver.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index c40ae49..1bd5a9a 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -55,8 +55,8 @@
if (3 + len > sizeof(buf)) {
dev_warn(&dev->client->dev,
- "%s: i2c wr reg=%04x: len=%d is too big!\n",
- KBUILD_MODNAME, reg, len);
+ "i2c wr reg=%04x: len=%d is too big!\n",
+ reg, len);
return -EINVAL;
}
@@ -69,9 +69,8 @@
if (ret == 1) {
ret = 0;
} else {
- dev_warn(&dev->client->dev,
- "%s: i2c wr failed=%d reg=%06x len=%d\n",
- KBUILD_MODNAME, ret, reg, len);
+ dev_warn(&dev->client->dev, "i2c wr failed=%d reg=%06x len=%d\n",
+ ret, reg, len);
ret = -EREMOTEIO;
}
@@ -102,9 +101,8 @@
if (ret == 2) {
ret = 0;
} else {
- dev_warn(&dev->client->dev,
- "%s: i2c rd failed=%d reg=%06x len=%d\n",
- KBUILD_MODNAME, ret, reg, len);
+ dev_warn(&dev->client->dev, "i2c rd failed=%d reg=%06x len=%d\n",
+ ret, reg, len);
ret = -EREMOTEIO;
}
@@ -176,11 +174,10 @@
int ret, i, j;
u8 buf[1 + MAX_TAB_LEN];
- dev_dbg(&dev->client->dev, "%s: tab_len=%d\n", __func__, tab_len);
+ dev_dbg(&dev->client->dev, "tab_len=%d\n", tab_len);
if (tab_len > sizeof(buf)) {
- dev_warn(&dev->client->dev, "%s: tab len %d is too big\n",
- KBUILD_MODNAME, tab_len);
+ dev_warn(&dev->client->dev, "tab len %d is too big\n", tab_len);
return -EINVAL;
}
@@ -201,7 +198,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -210,7 +207,7 @@
{
u32 r = 0, c = 0, i;
- dev_dbg(&dev->client->dev, "%s: a=%d b=%d x=%d\n", __func__, a, b, x);
+ dev_dbg(&dev->client->dev, "a=%d b=%d x=%d\n", a, b, x);
if (a > b) {
c = a / b;
@@ -227,8 +224,7 @@
}
r = (c << (u32)x) + r;
- dev_dbg(&dev->client->dev, "%s: a=%d b=%d x=%d r=%d r=%x\n",
- __func__, a, b, x, r, r);
+ dev_dbg(&dev->client->dev, "a=%d b=%d x=%d r=%d r=%x\n", a, b, x, r, r);
return r;
}
@@ -276,8 +272,8 @@
buf[2] = (clock_cw >> 16) & 0xff;
buf[3] = (clock_cw >> 24) & 0xff;
- dev_dbg(&dev->client->dev, "%s: clock=%d clock_cw=%08x\n",
- __func__, dev->cfg.clock, clock_cw);
+ dev_dbg(&dev->client->dev, "clock=%d clock_cw=%08x\n",
+ dev->cfg.clock, clock_cw);
ret = af9033_wr_regs(dev, 0x800025, buf, 4);
if (ret < 0)
@@ -294,8 +290,8 @@
buf[1] = (adc_cw >> 8) & 0xff;
buf[2] = (adc_cw >> 16) & 0xff;
- dev_dbg(&dev->client->dev, "%s: adc=%d adc_cw=%06x\n",
- __func__, clock_adc_lut[i].adc, adc_cw);
+ dev_dbg(&dev->client->dev, "adc=%d adc_cw=%06x\n",
+ clock_adc_lut[i].adc, adc_cw);
ret = af9033_wr_regs(dev, 0x80f1cd, buf, 3);
if (ret < 0)
@@ -336,7 +332,7 @@
}
/* load OFSM settings */
- dev_dbg(&dev->client->dev, "%s: load ofsm settings\n", __func__);
+ dev_dbg(&dev->client->dev, "load ofsm settings\n");
switch (dev->cfg.tuner) {
case AF9033_TUNER_IT9135_38:
case AF9033_TUNER_IT9135_51:
@@ -361,8 +357,7 @@
goto err;
/* load tuner specific settings */
- dev_dbg(&dev->client->dev, "%s: load tuner specific settings\n",
- __func__);
+ dev_dbg(&dev->client->dev, "load tuner specific settings\n");
switch (dev->cfg.tuner) {
case AF9033_TUNER_TUA9001:
len = ARRAY_SIZE(tuner_init_tua9001);
@@ -413,8 +408,8 @@
init = tuner_init_it9135_62;
break;
default:
- dev_dbg(&dev->client->dev, "%s: unsupported tuner ID=%d\n",
- __func__, dev->cfg.tuner);
+ dev_dbg(&dev->client->dev, "unsupported tuner ID=%d\n",
+ dev->cfg.tuner);
ret = -ENODEV;
goto err;
}
@@ -451,7 +446,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -478,7 +473,7 @@
usleep_range(200, 10000);
}
- dev_dbg(&dev->client->dev, "%s: loop=%d\n", __func__, i);
+ dev_dbg(&dev->client->dev, "loop=%d\n", i);
if (i == 0) {
ret = -ETIMEDOUT;
@@ -504,7 +499,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -528,8 +523,8 @@
u8 tmp, buf[3], bandwidth_reg_val;
u32 if_frequency, freq_cw, adc_freq;
- dev_dbg(&dev->client->dev, "%s: frequency=%d bandwidth_hz=%d\n",
- __func__, c->frequency, c->bandwidth_hz);
+ dev_dbg(&dev->client->dev, "frequency=%d bandwidth_hz=%d\n",
+ c->frequency, c->bandwidth_hz);
/* check bandwidth */
switch (c->bandwidth_hz) {
@@ -543,8 +538,7 @@
bandwidth_reg_val = 0x02;
break;
default:
- dev_dbg(&dev->client->dev, "%s: invalid bandwidth_hz\n",
- __func__);
+ dev_dbg(&dev->client->dev, "invalid bandwidth_hz\n");
ret = -EINVAL;
goto err;
}
@@ -646,7 +640,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -658,7 +652,7 @@
int ret;
u8 buf[8];
- dev_dbg(&dev->client->dev, "%s:\n", __func__);
+ dev_dbg(&dev->client->dev, "\n");
/* read all needed registers */
ret = af9033_rd_regs(dev, 0x80f900, buf, sizeof(buf));
@@ -773,7 +767,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -819,7 +813,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -873,7 +867,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -895,7 +889,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -941,7 +935,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -979,7 +973,7 @@
struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- dev_dbg(&dev->client->dev, "%s: enable=%d\n", __func__, enable);
+ dev_dbg(&dev->client->dev, "enable=%d\n", enable);
ret = af9033_wr_reg_mask(dev, 0x00fa04, enable, 0x01);
if (ret < 0)
@@ -988,7 +982,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -998,7 +992,7 @@
struct af9033_dev *dev = fe->demodulator_priv;
int ret;
- dev_dbg(&dev->client->dev, "%s: onoff=%d\n", __func__, onoff);
+ dev_dbg(&dev->client->dev, "onoff=%d\n", onoff);
ret = af9033_wr_reg_mask(dev, 0x80f993, onoff, 0x01);
if (ret < 0)
@@ -1007,7 +1001,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -1019,8 +1013,8 @@
int ret;
u8 wbuf[2] = {(pid >> 0) & 0xff, (pid >> 8) & 0xff};
- dev_dbg(&dev->client->dev, "%s: index=%d pid=%04x onoff=%d\n",
- __func__, index, pid, onoff);
+ dev_dbg(&dev->client->dev, "index=%d pid=%04x onoff=%d\n",
+ index, pid, onoff);
if (pid > 0x1fff)
return 0;
@@ -1040,7 +1034,7 @@
return 0;
err:
- dev_dbg(&dev->client->dev, "%s: failed=%d\n", __func__, ret);
+ dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret;
}
@@ -1110,8 +1104,8 @@
if (dev->cfg.clock != 12000000) {
ret = -ENODEV;
dev_err(&dev->client->dev,
- "%s: af9033: unsupported clock=%d, only 12000000 Hz is supported currently\n",
- KBUILD_MODNAME, dev->cfg.clock);
+ "unsupported clock %d Hz, only 12000000 Hz is supported currently\n",
+ dev->cfg.clock);
goto err_kfree;
}
@@ -1139,9 +1133,9 @@
goto err_kfree;
dev_info(&dev->client->dev,
- "%s: firmware version: LINK=%d.%d.%d.%d OFDM=%d.%d.%d.%d\n",
- KBUILD_MODNAME, buf[0], buf[1], buf[2], buf[3], buf[4],
- buf[5], buf[6], buf[7]);
+ "firmware version: LINK %d.%d.%d.%d - OFDM %d.%d.%d.%d\n",
+ buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6],
+ buf[7]);
/* sleep */
switch (dev->cfg.tuner) {
@@ -1192,7 +1186,7 @@
err_kfree:
kfree(dev);
err:
- dev_dbg(&client->dev, "failed %d\n", ret);
+ dev_dbg(&client->dev, "failed=%d\n", ret);
return ret;
}
@@ -1200,7 +1194,7 @@
{
struct af9033_dev *dev = i2c_get_clientdata(client);
- dev_dbg(&client->dev, "%s\n", __func__);
+ dev_dbg(&dev->client->dev, "\n");
dev->fe.ops.release = NULL;
dev->fe.demodulator_priv = NULL;
