From 3967ce8c026d574a6d51824795dc798f90db65bd Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 23 Jan 2009 00:29:03 -0200 Subject: Reverting changeset 10298. It were committed with a wrong From: meta-tag From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- .../drivers/media/video/usbvision/usbvision-core.c | 44 +++++++++------------- 1 file changed, 17 insertions(+), 27 deletions(-) (limited to 'linux/drivers/media/video/usbvision/usbvision-core.c') diff --git a/linux/drivers/media/video/usbvision/usbvision-core.c b/linux/drivers/media/video/usbvision/usbvision-core.c index 440f1b05a..33f37ac46 100644 --- a/linux/drivers/media/video/usbvision/usbvision-core.c +++ b/linux/drivers/media/video/usbvision/usbvision-core.c @@ -381,9 +381,8 @@ int usbvision_scratch_alloc(struct usb_usbvision *usbvision) usbvision->scratch = vmalloc_32(scratch_buf_size); scratch_reset(usbvision); if(usbvision->scratch == NULL) { - dev_err(&usbvision->dev->dev, - "%s: unable to allocate %d bytes for scratch\n", - __func__, scratch_buf_size); + err("%s: unable to allocate %d bytes for scratch", + __func__, scratch_buf_size); return -ENOMEM; } return 0; @@ -492,9 +491,8 @@ int usbvision_decompress_alloc(struct usb_usbvision *usbvision) int IFB_size = MAX_FRAME_WIDTH * MAX_FRAME_HEIGHT * 3 / 2; usbvision->IntraFrameBuffer = vmalloc_32(IFB_size); if (usbvision->IntraFrameBuffer == NULL) { - dev_err(&usbvision->dev->dev, - "%s: unable to allocate %d for compr. frame buffer\n", - __func__, IFB_size); + err("%s: unable to allocate %d for compr. frame buffer", + __func__, IFB_size); return -ENOMEM; } return 0; @@ -1521,9 +1519,8 @@ static void usbvision_isocIrq(struct urb *urb, struct pt_regs *regs) errCode = usb_submit_urb (urb, GFP_ATOMIC); if(errCode) { - dev_err(&usbvision->dev->dev, - "%s: usb_submit_urb failed: error %d\n", - __func__, errCode); + err("%s: usb_submit_urb failed: error %d", + __func__, errCode); } return; @@ -1554,8 +1551,7 @@ int usbvision_read_reg(struct usb_usbvision *usbvision, unsigned char reg) 0, (__u16) reg, buffer, 1, HZ); if (errCode < 0) { - dev_err(&usbvision->dev->dev, - "%s: failed: error %d\n", __func__, errCode); + err("%s: failed: error %d", __func__, errCode); return errCode; } return buffer[0]; @@ -1583,8 +1579,7 @@ int usbvision_write_reg(struct usb_usbvision *usbvision, unsigned char reg, USB_RECIP_ENDPOINT, 0, (__u16) reg, &value, 1, HZ); if (errCode < 0) { - dev_err(&usbvision->dev->dev, - "%s: failed: error %d\n", __func__, errCode); + err("%s: failed: error %d", __func__, errCode); } return errCode; } @@ -1864,8 +1859,7 @@ int usbvision_set_output(struct usb_usbvision *usbvision, int width, 0, (__u16) USBVISION_LXSIZE_O, value, 4, HZ); if (errCode < 0) { - dev_err(&usbvision->dev->dev, - "%s failed: error %d\n", __func__, errCode); + err("%s failed: error %d", __func__, errCode); return errCode; } usbvision->curwidth = usbvision->stretch_width * UsbWidth; @@ -2251,7 +2245,7 @@ static int usbvision_set_dram_settings(struct usb_usbvision *usbvision) (__u16) USBVISION_DRM_PRM1, value, 8, HZ); if (rc < 0) { - dev_err(&usbvision->dev->dev, "%sERROR=%d\n", __func__, rc); + err("%sERROR=%d", __func__, rc); return rc; } @@ -2459,9 +2453,8 @@ int usbvision_set_alternate(struct usb_usbvision *dev) PDEBUG(DBG_FUNC,"setting alternate %d with wMaxPacketSize=%u", dev->ifaceAlt,dev->isocPacketSize); errCode = usb_set_interface(dev->dev, dev->iface, dev->ifaceAlt); if (errCode < 0) { - dev_err(&dev->dev->dev, - "cannot change alternate number to %d (error=%i)\n", - dev->ifaceAlt, errCode); + err ("cannot change alternate number to %d (error=%i)", + dev->ifaceAlt, errCode); return errCode; } } @@ -2512,8 +2505,7 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision) urb = usb_alloc_urb(USBVISION_URB_FRAMES, GFP_KERNEL); if (urb == NULL) { - dev_err(&usbvision->dev->dev, - "%s: usb_alloc_urb() failed\n", __func__); + err("%s: usb_alloc_urb() failed", __func__); return -ENOMEM; } usbvision->sbuf[bufIdx].urb = urb; @@ -2545,9 +2537,8 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision) errCode = usb_submit_urb(usbvision->sbuf[bufIdx].urb, GFP_KERNEL); if (errCode) { - dev_err(&usbvision->dev->dev, - "%s: usb_submit_urb(%d) failed: error %d\n", - __func__, bufIdx, errCode); + err("%s: usb_submit_urb(%d) failed: error %d", + __func__, bufIdx, errCode); } } @@ -2596,9 +2587,8 @@ void usbvision_stop_isoc(struct usb_usbvision *usbvision) errCode = usb_set_interface(usbvision->dev, usbvision->iface, usbvision->ifaceAlt); if (errCode < 0) { - dev_err(&usbvision->dev->dev, - "%s: usb_set_interface() failed: error %d\n", - __func__, errCode); + err("%s: usb_set_interface() failed: error %d", + __func__, errCode); usbvision->last_error = errCode; } regValue = (16-usbvision_read_reg(usbvision, USBVISION_ALTER_REG)) & 0x0F; -- cgit v1.2.3