UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] cypress_firmware: use Kernel dev_foo() logging 

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-09-20 21:58:20 -03:00 committed by Mauro Carvalho Chehab
parent 3d8866dbb1
commit d6f35c7128
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/usb/dvb-usb-v2/cypress_firmware.c
View File

@ -30,6 +30,9 @@ static const struct usb_cypress_controller cypress[] = {
static int usb_cypress_writemem(struct usb_device *udev, u16 addr, u8 *data, static int usb_cypress_writemem(struct usb_device *udev, u16 addr, u8 *data,
u8 len) u8 len)
{ {
dvb_usb_dbg_usb_control_msg(udev,
0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len);
return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5000); 0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5000);
} }
@ -45,24 +48,24 @@ int usbv2_cypress_load_firmware(struct usb_device *udev,
reset = 1; reset = 1;
ret = usb_cypress_writemem(udev, cypress[type].cs_reg, &reset, 1); ret = usb_cypress_writemem(udev, cypress[type].cs_reg, &reset, 1);
if (ret != 1) if (ret != 1)
pr_err("%s: could not stop the USB controller CPU", dev_err(&udev->dev,
"%s: could not stop the USB controller CPU\n",
KBUILD_MODNAME); KBUILD_MODNAME);
while ((ret = dvb_usbv2_get_hexline(fw, &hx, &pos)) > 0) { while ((ret = dvb_usbv2_get_hexline(fw, &hx, &pos)) > 0) {
pr_debug("%s: writing to address %04x (buffer: %02x %02x)\n",
__func__, hx.addr, hx.len, hx.chk);
ret = usb_cypress_writemem(udev, hx.addr, hx.data, hx.len); ret = usb_cypress_writemem(udev, hx.addr, hx.data, hx.len);
if (ret != hx.len) { if (ret != hx.len) {
pr_err("%s: error while transferring firmware " \ dev_err(&udev->dev, "%s: error while transferring " \
"(transferred size=%d, block size=%d)", "firmware (transferred size=%d, " \
"block size=%d)\n",
KBUILD_MODNAME, ret, hx.len); KBUILD_MODNAME, ret, hx.len);
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
} }
if (ret < 0) { if (ret < 0) {
pr_err("%s: firmware download failed at %d with %d", dev_err(&udev->dev,
"%s: firmware download failed at %d with %d\n",
KBUILD_MODNAME, pos, ret); KBUILD_MODNAME, pos, ret);
return ret; return ret;
} }
@ -72,8 +75,8 @@ int usbv2_cypress_load_firmware(struct usb_device *udev,
reset = 0; reset = 0;
if (ret || usb_cypress_writemem( if (ret || usb_cypress_writemem(
udev, cypress[type].cs_reg, &reset, 1) != 1) { udev, cypress[type].cs_reg, &reset, 1) != 1) {
pr_err("%s: could not restart the USB controller CPU", dev_err(&udev->dev, "%s: could not restart the USB " \
KBUILD_MODNAME); "controller CPU\n", KBUILD_MODNAME);
ret = -EINVAL; ret = -EINVAL;
} }
} else } else