Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d89b9369 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] dvb_usb_v2: use dvb_usb_dbg_usb_control_msg() 



Convert drivers: au6610, ce6230, ec168, rtl28xxu for
dvb_usb_dbg_usb_control_msg() macro.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4ab79283

drivers/media/usb/dvb-usb-v2/au6610.c

+5 −0
Original line number Diff line number Diff line
@@ -56,6 +56,11 @@ static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr, 
	ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), operation,

			      USB_TYPE_VENDOR|USB_DIR_IN, addr << 1, index,

			      usb_buf, 6, AU6610_USB_TIMEOUT);



	dvb_usb_dbg_usb_control_msg(d->udev, operation,

			(USB_TYPE_VENDOR|USB_DIR_IN), addr << 1, index,

			usb_buf, 6);



	if (ret < 0)

		goto error;

drivers/media/usb/dvb-usb-v2/ce6230.c

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ static int ce6230_ctrl_msg(struct dvb_usb_device *d, struct usb_req *req) 
	ret = usb_control_msg(d->udev, pipe, request, requesttype, value, index,

			buf, req->data_len, CE6230_USB_TIMEOUT);



	ce6230_debug_dump(request, requesttype, value, index, buf,

			req->data_len);

	dvb_usb_dbg_usb_control_msg(d->udev, request, requesttype, value, index,

			buf, req->data_len);



	if (ret < 0)

		pr_err("%s: usb_control_msg() failed=%d\n", KBUILD_MODNAME,

drivers/media/usb/dvb-usb-v2/ce6230.h

+0 −11
Original line number Diff line number Diff line
@@ -26,17 +26,6 @@ 
#include "zl10353.h"

#include "mxl5005s.h"



#define ce6230_debug_dump(r, t, v, i, b, l) { \

	char *direction; \

	if (t == (USB_TYPE_VENDOR | USB_DIR_OUT)) \

		direction = ">>>"; \

	else \

		direction = "<<<"; \

	pr_debug("%s: %02x %02x %02x %02x %02x %02x %02x %02x %s [%d bytes]\n", \

			 __func__, t, r, v & 0xff, v >> 8, i & 0xff, i >> 8, \

			l & 0xff, l >> 8, direction, l); \

}



#define CE6230_USB_TIMEOUT 1000



struct usb_req {

drivers/media/usb/dvb-usb-v2/ec168.c

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static int ec168_ctrl_msg(struct dvb_usb_device *d, struct ec168_req *req) 
	ret = usb_control_msg(d->udev, pipe, request, requesttype, req->value,

		req->index, buf, req->size, EC168_USB_TIMEOUT);



	ec168_debug_dump(request, requesttype, req->value, req->index, buf,

		req->size);

	dvb_usb_dbg_usb_control_msg(d->udev, request, requesttype, req->value,

			req->index, buf, req->size);



	if (ret < 0)

		goto err_dealloc;

drivers/media/usb/dvb-usb-v2/ec168.h

+0 −11
Original line number Diff line number Diff line
@@ -24,17 +24,6 @@ 


#include "dvb_usb.h"



#define ec168_debug_dump(r, t, v, i, b, l) { \

	char *direction; \

	if (t == (USB_TYPE_VENDOR | USB_DIR_OUT)) \

		direction = ">>>"; \

	else \

		direction = "<<<"; \

	pr_debug("%s: %02x %02x %02x %02x %02x %02x %02x %02x %s\n", \

			 __func__, t, r, v & 0xff, v >> 8, i & 0xff, i >> 8, \

			l & 0xff, l >> 8, direction); \

}



#define EC168_USB_TIMEOUT 1000



struct ec168_req {