| Message ID | 1413108191-32510-2-git-send-email-olli.salonen@iki.fi (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Sun, 12 Oct 2014 13:03:09 +0300 Olli Salonen <olli.salonen@iki.fi> escreveu: > Added debug logging using dev_dgb. > > Signed-off-by: Olli Salonen <olli.salonen@iki.fi> > --- > drivers/media/usb/dvb-usb-v2/dvbsky.c | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c > index 502b52c..fabe3f5 100644 > --- a/drivers/media/usb/dvb-usb-v2/dvbsky.c > +++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c > @@ -68,6 +68,9 @@ static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff) > u8 obuf_pre[3] = { 0x37, 0, 0 }; > u8 obuf_post[3] = { 0x36, 3, 0 }; > > + dev_dbg(&d->udev->dev, "state: %s\n", (onoff == 1) > + ? "on" : "off"); > + > mutex_lock(&state->stream_mutex); > ret = dvbsky_usb_generic_rw(d, obuf_pre, 3, NULL, 0); > if (!ret && onoff) { > @@ -91,6 +94,8 @@ static int dvbsky_gpio_ctrl(struct dvb_usb_device *d, u8 gport, u8 value) > int ret; > u8 obuf[3], ibuf[2]; > > + dev_dbg(&d->udev->dev, "gport: %d, value: %d\n", gport, value); > + > obuf[0] = 0x0e; > obuf[1] = gport; > obuf[2] = value; > @@ -234,6 +239,9 @@ static int dvbsky_usb_set_voltage(struct dvb_frontend *fe, > struct dvbsky_state *state = d_to_priv(d); > u8 value; > > + dev_dbg(&d->udev->dev, "voltage: %s\n", > + (voltage == SEC_VOLTAGE_OFF) ? "off" : "on"); > + > if (voltage == SEC_VOLTAGE_OFF) > value = 0; > else > @@ -262,8 +270,10 @@ static int dvbsky_read_mac_addr(struct dvb_usb_adapter *adap, u8 mac[6]) > } > }; > > - if (i2c_transfer(&d->i2c_adap, msg, 2) == 2) > + if (i2c_transfer(&d->i2c_adap, msg, 2) == 2) { > memcpy(mac, ibuf, 6); > + dev_dbg(&d->udev->dev, "MAC: %pM\n", ibuf); > + } > > return 0; > } > @@ -274,6 +284,8 @@ static int dvbsky_usb_read_status(struct dvb_frontend *fe, fe_status_t *status) > struct dvbsky_state *state = d_to_priv(d); > int ret; > > + dev_dbg(&d->udev->dev, "\n"); > + > ret = state->fe_read_status(fe, status); > > /* it need resync slave fifo when signal change from unlock to lock.*/ > @@ -309,6 +321,9 @@ static int dvbsky_s960_attach(struct dvb_usb_adapter *adap) > struct m88ts2022_config m88ts2022_config = { > .clock = 27000000, > }; > + > + dev_dbg(&d->udev->dev, "\n"); > + > memset(&info, 0, sizeof(struct i2c_board_info)); > > /* attach demod */ > @@ -362,6 +377,8 @@ fail_attach: > > static int dvbsky_identify_state(struct dvb_usb_device *d, const char **name) > { > + dev_dbg(&d->udev->dev, "\n"); > + > dvbsky_gpio_ctrl(d, 0x04, 1); > msleep(20); > dvbsky_gpio_ctrl(d, 0x83, 0); > @@ -378,6 +395,8 @@ static int dvbsky_init(struct dvb_usb_device *d) > { > struct dvbsky_state *state = d_to_priv(d); > > + dev_dbg(&d->udev->dev, "\n"); > + > /* use default interface */ > /* > ret = usb_set_interface(d->udev, 0, 0); > @@ -396,6 +415,8 @@ static void dvbsky_exit(struct dvb_usb_device *d) > struct dvbsky_state *state = d_to_priv(d); > struct i2c_client *client; > > + dev_dbg(&d->udev->dev, "\n"); > + No need to add new debug macros that only prints the called functions, as you could get it too with Kernel tracing. > client = state->i2c_client_tuner; > /* remove I2C tuner */ > if (client) { -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/03/2014 03:04 PM, Mauro Carvalho Chehab wrote: > Em Sun, 12 Oct 2014 13:03:09 +0300 > Olli Salonen <olli.salonen@iki.fi> escreveu: > >> Added debug logging using dev_dgb. >> @@ -396,6 +415,8 @@ static void dvbsky_exit(struct dvb_usb_device *d) >> struct dvbsky_state *state = d_to_priv(d); >> struct i2c_client *client; >> >> + dev_dbg(&d->udev->dev, "\n"); >> + > > No need to add new debug macros that only prints the called functions, > as you could get it too with Kernel tracing. ftrace [1] is a bit heavy tool for module debugs like that. There is many different debugs for different use cases. When you add debugs to module those are usually used just to see how your module works and functions are called. Same is for V4L core debugs too; enable those and you will get tons of unneeded/useless information which makes totally hard to develop driver in question. When you add debugs to driver module, those are generally useful for cases where you want develop that certain driver module and not see zillion lines of unrelated debug data. Also, I think that kind of debug log will not generate any binary code when debug options are not enabled by Kconfig, so it is not even reason for optimization. [1] https://www.kernel.org/doc/Documentation/trace/ftrace.txt regards Antti
diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c index 502b52c..fabe3f5 100644 --- a/drivers/media/usb/dvb-usb-v2/dvbsky.c +++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c @@ -68,6 +68,9 @@ static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff) u8 obuf_pre[3] = { 0x37, 0, 0 }; u8 obuf_post[3] = { 0x36, 3, 0 }; + dev_dbg(&d->udev->dev, "state: %s\n", (onoff == 1) + ? "on" : "off"); + mutex_lock(&state->stream_mutex); ret = dvbsky_usb_generic_rw(d, obuf_pre, 3, NULL, 0); if (!ret && onoff) { @@ -91,6 +94,8 @@ static int dvbsky_gpio_ctrl(struct dvb_usb_device *d, u8 gport, u8 value) int ret; u8 obuf[3], ibuf[2]; + dev_dbg(&d->udev->dev, "gport: %d, value: %d\n", gport, value); + obuf[0] = 0x0e; obuf[1] = gport; obuf[2] = value; @@ -234,6 +239,9 @@ static int dvbsky_usb_set_voltage(struct dvb_frontend *fe, struct dvbsky_state *state = d_to_priv(d); u8 value; + dev_dbg(&d->udev->dev, "voltage: %s\n", + (voltage == SEC_VOLTAGE_OFF) ? "off" : "on"); + if (voltage == SEC_VOLTAGE_OFF) value = 0; else @@ -262,8 +270,10 @@ static int dvbsky_read_mac_addr(struct dvb_usb_adapter *adap, u8 mac[6]) } }; - if (i2c_transfer(&d->i2c_adap, msg, 2) == 2) + if (i2c_transfer(&d->i2c_adap, msg, 2) == 2) { memcpy(mac, ibuf, 6); + dev_dbg(&d->udev->dev, "MAC: %pM\n", ibuf); + } return 0; } @@ -274,6 +284,8 @@ static int dvbsky_usb_read_status(struct dvb_frontend *fe, fe_status_t *status) struct dvbsky_state *state = d_to_priv(d); int ret; + dev_dbg(&d->udev->dev, "\n"); + ret = state->fe_read_status(fe, status); /* it need resync slave fifo when signal change from unlock to lock.*/ @@ -309,6 +321,9 @@ static int dvbsky_s960_attach(struct dvb_usb_adapter *adap) struct m88ts2022_config m88ts2022_config = { .clock = 27000000, }; + + dev_dbg(&d->udev->dev, "\n"); + memset(&info, 0, sizeof(struct i2c_board_info)); /* attach demod */ @@ -362,6 +377,8 @@ fail_attach: static int dvbsky_identify_state(struct dvb_usb_device *d, const char **name) { + dev_dbg(&d->udev->dev, "\n"); + dvbsky_gpio_ctrl(d, 0x04, 1); msleep(20); dvbsky_gpio_ctrl(d, 0x83, 0); @@ -378,6 +395,8 @@ static int dvbsky_init(struct dvb_usb_device *d) { struct dvbsky_state *state = d_to_priv(d); + dev_dbg(&d->udev->dev, "\n"); + /* use default interface */ /* ret = usb_set_interface(d->udev, 0, 0); @@ -396,6 +415,8 @@ static void dvbsky_exit(struct dvb_usb_device *d) struct dvbsky_state *state = d_to_priv(d); struct i2c_client *client; + dev_dbg(&d->udev->dev, "\n"); + client = state->i2c_client_tuner; /* remove I2C tuner */ if (client) {
Added debug logging using dev_dgb. Signed-off-by: Olli Salonen <olli.salonen@iki.fi> --- drivers/media/usb/dvb-usb-v2/dvbsky.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)