Commit 40bba097 authored by Olli Salonen's avatar Olli Salonen Committed by Mauro Carvalho Chehab

[media] dvbsky: clean logging

dev_err includes the function name in the log printout, so there is no need to include it manually. While here, fix a small grammatical error in the i2c error message.
Signed-off-by: default avatarOlli Salonen <olli.salonen@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 49141aa2
...@@ -96,8 +96,7 @@ static int dvbsky_gpio_ctrl(struct dvb_usb_device *d, u8 gport, u8 value) ...@@ -96,8 +96,7 @@ static int dvbsky_gpio_ctrl(struct dvb_usb_device *d, u8 gport, u8 value)
obuf[2] = value; obuf[2] = value;
ret = dvbsky_usb_generic_rw(d, obuf, 3, ibuf, 1); ret = dvbsky_usb_generic_rw(d, obuf, 3, ibuf, 1);
if (ret) if (ret)
dev_err(&d->udev->dev, "%s: %s() failed=%d\n", dev_err(&d->udev->dev, "failed=%d\n", ret);
KBUILD_MODNAME, __func__, ret);
return ret; return ret;
} }
...@@ -114,7 +113,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], ...@@ -114,7 +113,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
if (num > 2) { if (num > 2) {
dev_err(&d->udev->dev, dev_err(&d->udev->dev,
"dvbsky_usb: too many i2c messages[%d] than 2.", num); "too many i2c messages[%d], max 2.", num);
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto i2c_error; goto i2c_error;
} }
...@@ -122,7 +121,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], ...@@ -122,7 +121,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
if (num == 1) { if (num == 1) {
if (msg[0].len > 60) { if (msg[0].len > 60) {
dev_err(&d->udev->dev, dev_err(&d->udev->dev,
"dvbsky_usb: too many i2c bytes[%d] than 60.", "too many i2c bytes[%d], max 60.",
msg[0].len); msg[0].len);
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto i2c_error; goto i2c_error;
...@@ -136,8 +135,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], ...@@ -136,8 +135,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
ret = dvbsky_usb_generic_rw(d, obuf, 4, ret = dvbsky_usb_generic_rw(d, obuf, 4,
ibuf, msg[0].len + 1); ibuf, msg[0].len + 1);
if (ret) if (ret)
dev_err(&d->udev->dev, "%s: %s() failed=%d\n", dev_err(&d->udev->dev, "failed=%d\n", ret);
KBUILD_MODNAME, __func__, ret);
if (!ret) if (!ret)
memcpy(msg[0].buf, &ibuf[1], msg[0].len); memcpy(msg[0].buf, &ibuf[1], msg[0].len);
} else { } else {
...@@ -149,13 +147,12 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], ...@@ -149,13 +147,12 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
ret = dvbsky_usb_generic_rw(d, obuf, ret = dvbsky_usb_generic_rw(d, obuf,
msg[0].len + 3, ibuf, 1); msg[0].len + 3, ibuf, 1);
if (ret) if (ret)
dev_err(&d->udev->dev, "%s: %s() failed=%d\n", dev_err(&d->udev->dev, "failed=%d\n", ret);
KBUILD_MODNAME, __func__, ret);
} }
} else { } else {
if ((msg[0].len > 60) || (msg[1].len > 60)) { if ((msg[0].len > 60) || (msg[1].len > 60)) {
dev_err(&d->udev->dev, dev_err(&d->udev->dev,
"dvbsky_usb: too many i2c bytes[w-%d][r-%d] than 60.", "too many i2c bytes[w-%d][r-%d], max 60.",
msg[0].len, msg[1].len); msg[0].len, msg[1].len);
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto i2c_error; goto i2c_error;
...@@ -169,8 +166,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], ...@@ -169,8 +166,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
ret = dvbsky_usb_generic_rw(d, obuf, ret = dvbsky_usb_generic_rw(d, obuf,
msg[0].len + 4, ibuf, msg[1].len + 1); msg[0].len + 4, ibuf, msg[1].len + 1);
if (ret) if (ret)
dev_err(&d->udev->dev, "%s: %s() failed=%d\n", dev_err(&d->udev->dev, "failed=%d\n", ret);
KBUILD_MODNAME, __func__, ret);
if (!ret) if (!ret)
memcpy(msg[1].buf, &ibuf[1], msg[1].len); memcpy(msg[1].buf, &ibuf[1], msg[1].len);
...@@ -201,8 +197,7 @@ static int dvbsky_rc_query(struct dvb_usb_device *d) ...@@ -201,8 +197,7 @@ static int dvbsky_rc_query(struct dvb_usb_device *d)
obuf[0] = 0x10; obuf[0] = 0x10;
ret = dvbsky_usb_generic_rw(d, obuf, 1, ibuf, 2); ret = dvbsky_usb_generic_rw(d, obuf, 1, ibuf, 2);
if (ret) if (ret)
dev_err(&d->udev->dev, "%s: %s() failed=%d\n", dev_err(&d->udev->dev, "failed=%d\n", ret);
KBUILD_MODNAME, __func__, ret);
if (ret == 0) if (ret == 0)
code = (ibuf[0] << 8) | ibuf[1]; code = (ibuf[0] << 8) | ibuf[1];
if (code != 0xffff) { if (code != 0xffff) {
......
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