diff options
Diffstat (limited to 'drivers/media/video/usbvideo/konicawc.c')
-rw-r--r-- | drivers/media/video/usbvideo/konicawc.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c index 1c180284ec6c..e986c28b7bb0 100644 --- a/drivers/media/video/usbvideo/konicawc.c +++ b/drivers/media/video/usbvideo/konicawc.c | |||
@@ -337,7 +337,8 @@ static int konicawc_compress_iso(struct uvd *uvd, struct urb *dataurb, struct ur | |||
337 | } | 337 | } |
338 | 338 | ||
339 | if((sts > 0x01) && (sts < 0x80)) { | 339 | if((sts > 0x01) && (sts < 0x80)) { |
340 | info("unknown status %2.2x", sts); | 340 | dev_info(&uvd->dev->dev, "unknown status %2.2x\n", |
341 | sts); | ||
341 | bad++; | 342 | bad++; |
342 | continue; | 343 | continue; |
343 | } | 344 | } |
@@ -568,8 +569,12 @@ static void konicawc_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame) | |||
568 | fdrops = (0x80 + curframe - cam->lastframe) & 0x7F; | 569 | fdrops = (0x80 + curframe - cam->lastframe) & 0x7F; |
569 | fdrops--; | 570 | fdrops--; |
570 | if(fdrops) { | 571 | if(fdrops) { |
571 | info("Dropped %d frames (%d -> %d)", fdrops, | 572 | dev_info(&uvd->dev->dev, |
572 | cam->lastframe, curframe); | 573 | "Dropped %d frames " |
574 | "(%d -> %d)\n", | ||
575 | fdrops, | ||
576 | cam->lastframe, | ||
577 | curframe); | ||
573 | } | 578 | } |
574 | } | 579 | } |
575 | cam->lastframe = curframe; | 580 | cam->lastframe = curframe; |
@@ -784,7 +789,8 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id | |||
784 | if (dev->descriptor.bNumConfigurations != 1) | 789 | if (dev->descriptor.bNumConfigurations != 1) |
785 | return -ENODEV; | 790 | return -ENODEV; |
786 | 791 | ||
787 | info("Konica Webcam (rev. 0x%04x)", le16_to_cpu(dev->descriptor.bcdDevice)); | 792 | dev_info(&intf->dev, "Konica Webcam (rev. 0x%04x)\n", |
793 | le16_to_cpu(dev->descriptor.bcdDevice)); | ||
788 | RESTRICT_TO_RANGE(speed, 0, MAX_SPEED); | 794 | RESTRICT_TO_RANGE(speed, 0, MAX_SPEED); |
789 | 795 | ||
790 | /* Validate found interface: must have one ISO endpoint */ | 796 | /* Validate found interface: must have one ISO endpoint */ |
@@ -925,7 +931,8 @@ static struct usb_device_id id_table[] = { | |||
925 | static int __init konicawc_init(void) | 931 | static int __init konicawc_init(void) |
926 | { | 932 | { |
927 | struct usbvideo_cb cbTbl; | 933 | struct usbvideo_cb cbTbl; |
928 | info(DRIVER_DESC " " DRIVER_VERSION); | 934 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
935 | DRIVER_DESC "\n"); | ||
929 | memset(&cbTbl, 0, sizeof(cbTbl)); | 936 | memset(&cbTbl, 0, sizeof(cbTbl)); |
930 | cbTbl.probe = konicawc_probe; | 937 | cbTbl.probe = konicawc_probe; |
931 | cbTbl.setupOnOpen = konicawc_setup_on_open; | 938 | cbTbl.setupOnOpen = konicawc_setup_on_open; |