summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/dabusb.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/dabusb.c')
-rw-r--r--linux/drivers/media/video/dabusb.c74
1 files changed, 28 insertions, 46 deletions
diff --git a/linux/drivers/media/video/dabusb.c b/linux/drivers/media/video/dabusb.c
index b399f18c1..7ba206b34 100644
--- a/linux/drivers/media/video/dabusb.c
+++ b/linux/drivers/media/video/dabusb.c
@@ -199,20 +199,17 @@ static void dabusb_iso_complete (struct urb *purb)
dst += len;
}
else
- dev_err(&purb->dev->dev,
- "dabusb_iso_complete: invalid len %d\n", len);
+ err("dabusb_iso_complete: invalid len %d", len);
}
else
dev_warn(&purb->dev->dev, "dabusb_iso_complete: corrupted packet status: %d\n", purb->iso_frame_desc[i].status);
if (dst != purb->actual_length)
- dev_err(&purb->dev->dev,
- "dst!=purb->actual_length:%d!=%d\n",
- dst, purb->actual_length);
+ err("dst!=purb->actual_length:%d!=%d", dst, purb->actual_length);
}
if (atomic_dec_and_test (&s->pending_io) && !s->remove_pending && s->state != _stopped) {
s->overruns++;
- dev_err(&purb->dev->dev, "overrun (%d)\n", s->overruns);
+ err("overrun (%d)", s->overruns);
}
wake_up (&s->wait);
}
@@ -233,14 +230,13 @@ static int dabusb_alloc_buffers (pdabusb_t s)
while (transfer_len < (s->total_buffer_size << 10)) {
b = kzalloc(sizeof (buff_t), GFP_KERNEL);
if (!b) {
- dev_err(&s->usbdev->dev,
- "kzalloc(sizeof(buff_t))==NULL\n");
+ err("kzalloc(sizeof(buff_t))==NULL");
goto err;
}
b->s = s;
b->purb = usb_alloc_urb(packets, GFP_KERNEL);
if (!b->purb) {
- dev_err(&s->usbdev->dev, "usb_alloc_urb == NULL\n");
+ err("usb_alloc_urb == NULL");
kfree (b);
goto err;
}
@@ -249,8 +245,7 @@ static int dabusb_alloc_buffers (pdabusb_t s)
if (!b->purb->transfer_buffer) {
kfree (b->purb);
kfree (b);
- dev_err(&s->usbdev->dev,
- "kmalloc(%d)==NULL\n", transfer_buffer_length);
+ err("kmalloc(%d)==NULL", transfer_buffer_length);
goto err;
}
@@ -294,11 +289,10 @@ static int dabusb_bulk (pdabusb_t s, pbulk_transfer_t pb)
ret=usb_bulk_msg(s->usbdev, pipe, pb->data, pb->size, &actual_length, 100);
if(ret<0) {
- dev_err(&s->usbdev->dev,
- "usb_bulk_msg failed(%d)\n", ret);
+ err("dabusb: usb_bulk_msg failed(%d)",ret);
if (usb_set_interface (s->usbdev, _DABUSB_IF, 1) < 0) {
- dev_err(&s->usbdev->dev, "set_interface failed\n");
+ err("set_interface failed");
return -EINVAL;
}
@@ -307,7 +301,7 @@ static int dabusb_bulk (pdabusb_t s, pbulk_transfer_t pb)
if( ret == -EPIPE ) {
dev_warn(&s->usbdev->dev, "CLEAR_FEATURE request to remove STALL condition.\n");
if(usb_clear_halt(s->usbdev, usb_pipeendpoint(pipe)))
- dev_err(&s->usbdev->dev, "request failed\n");
+ err("request failed");
}
pb->size = actual_length;
@@ -325,8 +319,7 @@ static int dabusb_writemem (pdabusb_t s, int pos, const unsigned char *data,
unsigned char *transfer_buffer = kmalloc (len, GFP_KERNEL);
if (!transfer_buffer) {
- dev_err(&s->usbdev->dev,
- "dabusb_writemem: kmalloc(%d) failed.\n", len);
+ err("dabusb_writemem: kmalloc(%d) failed.", len);
return -ENOMEM;
}
@@ -359,8 +352,7 @@ static int dabusb_loadmem (pdabusb_t s, const char *fname)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
ret = request_ihex_firmware(&fw, "dabusb/firmware.fw", &s->usbdev->dev);
if (ret) {
- dev_err(&s->usbdev->dev,
- "Failed to load \"dabusb/firmware.fw\": %d\n", ret);
+ err("Failed to load \"dabusb/firmware.fw\": %d\n", ret);
goto out;
}
#endif
@@ -386,14 +378,11 @@ static int dabusb_loadmem (pdabusb_t s, const char *fname)
#endif
if (ret < 0) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
- dev_err(&s->usbdev->dev,
- "dabusb_writemem failed (%d %04X %p %d)\n",
- ret, ptr->Address, ptr->Data, ptr->Length);
+ err("dabusb_writemem failed (%d %04X %p %d)", ret, ptr->Address, ptr->Data, ptr->Length);
#else
- dev_err(&s->usbdev->dev,
- "dabusb_writemem failed (%d %04X %p %d)\n",
- ret, be32_to_cpu(rec->addr),
- rec->data, be16_to_cpu(rec->len));
+ err("dabusb_writemem failed (%d %04X %p %d)", ret,
+ be32_to_cpu(rec->addr), rec->data,
+ be16_to_cpu(rec->len));
#endif
break;
}
@@ -454,16 +443,14 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname)
dbg("Enter dabusb_fpga_download (internal)");
if (!b) {
- dev_err(&s->usbdev->dev,
- "kmalloc(sizeof(bulk_transfer_t))==NULL\n");
+ err("kmalloc(sizeof(bulk_transfer_t))==NULL");
return -ENOMEM;
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
ret = request_firmware(&fw, "dabusb/bitstream.bin", &s->usbdev->dev);
if (ret) {
- dev_err(&s->usbdev->dev,
- "Failed to load \"dabusb/bitstream.bin\": %d\n", ret);
+ err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret);
kfree(b);
return ret;
}
@@ -495,7 +482,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname)
#endif
ret = dabusb_bulk (s, b);
if (ret < 0) {
- dev_err(&s->usbdev->dev, "dabusb_bulk failed.\n");
+ err("dabusb_bulk failed.");
break;
}
mdelay (1);
@@ -550,11 +537,9 @@ static int dabusb_startrek (pdabusb_t s)
ret = usb_submit_urb (end->purb, GFP_KERNEL);
if (ret) {
- dev_err(&s->usbdev->dev,
- "usb_submit_urb returned:%d\n", ret);
+ err("usb_submit_urb returned:%d", ret);
if (dabusb_add_buf_tail (s, &s->free_buff_list, &s->rec_buff_list))
- dev_err(&s->usbdev->dev,
- "startrek: dabusb_add_buf_tail failed\n");
+ err("startrek: dabusb_add_buf_tail failed");
break;
}
else
@@ -597,8 +582,7 @@ static ssize_t dabusb_read (struct file *file, char __user *buf, size_t count, l
spin_unlock_irqrestore(&s->lock, flags);
- dev_err(&s->usbdev->dev,
- "error: rec_buf_list is empty\n");
+ err("error: rec_buf_list is empty");
goto err;
}
@@ -627,8 +611,7 @@ static ssize_t dabusb_read (struct file *file, char __user *buf, size_t count, l
if (list_empty (&s->rec_buff_list)) {
spin_unlock_irqrestore(&s->lock, flags);
- dev_err(&s->usbdev->dev,
- "error: still no buffer available.\n");
+ err("error: still no buffer available.");
goto err;
}
spin_unlock_irqrestore(&s->lock, flags);
@@ -649,7 +632,7 @@ static ssize_t dabusb_read (struct file *file, char __user *buf, size_t count, l
dbg("copy_to_user:%p %p %d",buf, purb->transfer_buffer + s->readptr, cnt);
if (copy_to_user (buf, purb->transfer_buffer + s->readptr, cnt)) {
- dev_err(&s->usbdev->dev, "read: copy_to_user failed\n");
+ err("read: copy_to_user failed");
if (!ret)
ret = -EFAULT;
goto err;
@@ -663,8 +646,7 @@ static ssize_t dabusb_read (struct file *file, char __user *buf, size_t count, l
if (s->readptr == purb->actual_length) {
// finished, take next buffer
if (dabusb_add_buf_tail (s, &s->free_buff_list, &s->rec_buff_list))
- dev_err(&s->usbdev->dev,
- "read: dabusb_add_buf_tail failed\n");
+ err("read: dabusb_add_buf_tail failed");
s->readptr = 0;
}
}
@@ -700,7 +682,7 @@ static int dabusb_open (struct inode *inode, struct file *file)
}
if (usb_set_interface (s->usbdev, _DABUSB_IF, 1) < 0) {
mutex_unlock(&s->mutex);
- dev_err(&s->usbdev->dev, "set_interface failed\n");
+ err("set_interface failed");
return -EINVAL;
}
s->opened = 1;
@@ -725,7 +707,7 @@ static int dabusb_release (struct inode *inode, struct file *file)
if (!s->remove_pending) {
if (usb_set_interface (s->usbdev, _DABUSB_IF, 0) < 0)
- dev_err(&s->usbdev->dev, "set_interface failed\n");
+ err("set_interface failed");
}
else
wake_up (&s->remove_ok);
@@ -845,7 +827,7 @@ static int dabusb_probe (struct usb_interface *intf,
s->devnum = intf->minor;
if (usb_reset_configuration (usbdev) < 0) {
- dev_err(&intf->dev, "reset_configuration failed\n");
+ err("reset_configuration failed");
goto reject;
}
if (le16_to_cpu(usbdev->descriptor.idProduct) == 0x2131) {
@@ -856,7 +838,7 @@ static int dabusb_probe (struct usb_interface *intf,
dabusb_fpga_download (s, NULL);
if (usb_set_interface (s->usbdev, _DABUSB_IF, 0) < 0) {
- dev_err(&intf->dev, "set_interface failed\n");
+ err("set_interface failed");
goto reject;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-08 14:10:13 +0000