Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 16:50:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] dvb_usb_v2: use dvb_usb_dbg_usb_control_msg()

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

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2012-08-22 19:42:00 -03:00 committed by Mauro Carvalho Chehab
parent 4ab79283aa
commit d89b9369e0
7 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/usb/dvb-usb-v2/au6610.c
View File

@ -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;

4
drivers/media/usb/dvb-usb-v2/ce6230.c
View File

@ -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,

11
drivers/media/usb/dvb-usb-v2/ce6230.h
View File

@ -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 {

4
drivers/media/usb/dvb-usb-v2/ec168.c
View File

@ -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;

11
drivers/media/usb/dvb-usb-v2/ec168.h
View File

@ -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 {

6
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
View File

@ -59,11 +59,13 @@ static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)
ret = usb_control_msg(d->udev, pipe, 0, requesttype, req->value,
req->index, buf, req->size, 1000);
dvb_usb_dbg_usb_control_msg(d->udev, 0, requesttype, req->value,
req->index, buf, req->size);
if (ret > 0)
ret = 0;
deb_dump(0, requesttype, req->value, req->index, buf, req->size);
/* read request, copy returned data to return buf */
if (!ret && requesttype == (USB_TYPE_VENDOR | USB_DIR_IN))
memcpy(req->data, buf, req->size);

11
drivers/media/usb/dvb-usb-v2/rtl28xxu.h
View File

@ -24,17 +24,6 @@
#include "dvb_usb.h"
#define deb_dump(r, t, v, i, b, l) { \
char *direction; \
if (t == (USB_TYPE_VENDOR | USB_DIR_OUT)) \
direction = ">>>"; \
else \
direction = "<<<"; \
dev_dbg(&d->udev->dev, "%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); \
}
/*
* USB commands
* (usb_control_msg() index parameter)