diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-22 09:49:28 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-26 07:10:04 -0500 |
commit | 0dd5f20cb35b59f82b35e918658fa8ab22b9f13a (patch) | |
tree | 71a6e997ed7dc63abbcc3978df7a3cae5db3adc1 /drivers/media/usb/siano | |
parent | 6908368879c3e4965d849c893d3741858a8d1842 (diff) |
[media] siano: get rid of sms_info()
On most cases, sms_info() should actually be pr_debug(), but,
on other places, it should be pr_info().
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/siano')
-rw-r--r-- | drivers/media/usb/siano/smsusb.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c index 192cfd785f64..412052f6da65 100644 --- a/drivers/media/usb/siano/smsusb.c +++ b/drivers/media/usb/siano/smsusb.c | |||
@@ -275,14 +275,14 @@ static int smsusb1_load_firmware(struct usb_device *udev, int id, int board_id) | |||
275 | rc = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 2), | 275 | rc = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 2), |
276 | fw_buffer, fw->size, &dummy, 1000); | 276 | fw_buffer, fw->size, &dummy, 1000); |
277 | 277 | ||
278 | sms_info("sent %zu(%d) bytes, rc %d", fw->size, dummy, rc); | 278 | pr_debug("sent %zu(%d) bytes, rc %d\n", fw->size, dummy, rc); |
279 | 279 | ||
280 | kfree(fw_buffer); | 280 | kfree(fw_buffer); |
281 | } else { | 281 | } else { |
282 | pr_err("failed to allocate firmware buffer\n"); | 282 | pr_err("failed to allocate firmware buffer\n"); |
283 | rc = -ENOMEM; | 283 | rc = -ENOMEM; |
284 | } | 284 | } |
285 | sms_info("read FW %s, size=%zu", fw_filename, fw->size); | 285 | pr_debug("read FW %s, size=%zu\n", fw_filename, fw->size); |
286 | 286 | ||
287 | release_firmware(fw); | 287 | release_firmware(fw); |
288 | 288 | ||
@@ -308,7 +308,7 @@ static void smsusb1_detectmode(void *context, int *mode) | |||
308 | else if (strstr(product_string, "TDMB")) | 308 | else if (strstr(product_string, "TDMB")) |
309 | *mode = 2; | 309 | *mode = 2; |
310 | 310 | ||
311 | sms_info("%d \"%s\"", *mode, product_string); | 311 | pr_debug("%d \"%s\"\n", *mode, product_string); |
312 | } | 312 | } |
313 | 313 | ||
314 | static int smsusb1_setmode(void *context, int mode) | 314 | static int smsusb1_setmode(void *context, int mode) |
@@ -337,7 +337,7 @@ static void smsusb_term_device(struct usb_interface *intf) | |||
337 | if (dev->coredev) | 337 | if (dev->coredev) |
338 | smscore_unregister_device(dev->coredev); | 338 | smscore_unregister_device(dev->coredev); |
339 | 339 | ||
340 | sms_info("device 0x%p destroyed", dev); | 340 | pr_debug("device 0x%p destroyed\n", dev); |
341 | kfree(dev); | 341 | kfree(dev); |
342 | } | 342 | } |
343 | 343 | ||
@@ -375,7 +375,7 @@ static void siano_media_device_register(struct smsusb_device_t *dev) | |||
375 | 375 | ||
376 | dev->coredev->media_dev = mdev; | 376 | dev->coredev->media_dev = mdev; |
377 | 377 | ||
378 | sms_info("media controller created"); | 378 | pr_info("media controller created\n"); |
379 | 379 | ||
380 | #endif | 380 | #endif |
381 | } | 381 | } |
@@ -425,7 +425,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) | |||
425 | dev->out_ep = intf->cur_altsetting->endpoint[i].desc.bEndpointAddress; | 425 | dev->out_ep = intf->cur_altsetting->endpoint[i].desc.bEndpointAddress; |
426 | } | 426 | } |
427 | 427 | ||
428 | sms_info("in_ep = %02x, out_ep = %02x", | 428 | pr_debug("in_ep = %02x, out_ep = %02x\n", |
429 | dev->in_ep, dev->out_ep); | 429 | dev->in_ep, dev->out_ep); |
430 | 430 | ||
431 | params.device = &dev->udev->dev; | 431 | params.device = &dev->udev->dev; |
@@ -453,7 +453,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) | |||
453 | usb_init_urb(&dev->surbs[i].urb); | 453 | usb_init_urb(&dev->surbs[i].urb); |
454 | } | 454 | } |
455 | 455 | ||
456 | sms_info("smsusb_start_streaming(...)."); | 456 | pr_debug("smsusb_start_streaming(...).\n"); |
457 | rc = smsusb_start_streaming(dev); | 457 | rc = smsusb_start_streaming(dev); |
458 | if (rc < 0) { | 458 | if (rc < 0) { |
459 | pr_err("smsusb_start_streaming(...) failed\n"); | 459 | pr_err("smsusb_start_streaming(...) failed\n"); |
@@ -470,7 +470,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) | |||
470 | return rc; | 470 | return rc; |
471 | } | 471 | } |
472 | 472 | ||
473 | sms_info("device 0x%p created", dev); | 473 | pr_debug("device 0x%p created\n", dev); |
474 | siano_media_device_register(dev); | 474 | siano_media_device_register(dev); |
475 | 475 | ||
476 | return rc; | 476 | return rc; |
@@ -483,7 +483,7 @@ static int smsusb_probe(struct usb_interface *intf, | |||
483 | char devpath[32]; | 483 | char devpath[32]; |
484 | int i, rc; | 484 | int i, rc; |
485 | 485 | ||
486 | sms_info("board id=%lu, interface number %d", | 486 | pr_info("board id=%lu, interface number %d\n", |
487 | id->driver_info, | 487 | id->driver_info, |
488 | intf->cur_altsetting->desc.bInterfaceNumber); | 488 | intf->cur_altsetting->desc.bInterfaceNumber); |
489 | 489 | ||
@@ -505,10 +505,10 @@ static int smsusb_probe(struct usb_interface *intf, | |||
505 | } | 505 | } |
506 | } | 506 | } |
507 | 507 | ||
508 | sms_info("smsusb_probe %d", | 508 | pr_debug("smsusb_probe %d\n", |
509 | intf->cur_altsetting->desc.bInterfaceNumber); | 509 | intf->cur_altsetting->desc.bInterfaceNumber); |
510 | for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++) { | 510 | for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++) { |
511 | sms_info("endpoint %d %02x %02x %d", i, | 511 | pr_debug("endpoint %d %02x %02x %d\n", i, |
512 | intf->cur_altsetting->endpoint[i].desc.bEndpointAddress, | 512 | intf->cur_altsetting->endpoint[i].desc.bEndpointAddress, |
513 | intf->cur_altsetting->endpoint[i].desc.bmAttributes, | 513 | intf->cur_altsetting->endpoint[i].desc.bmAttributes, |
514 | intf->cur_altsetting->endpoint[i].desc.wMaxPacketSize); | 514 | intf->cur_altsetting->endpoint[i].desc.wMaxPacketSize); |
@@ -531,14 +531,15 @@ static int smsusb_probe(struct usb_interface *intf, | |||
531 | 531 | ||
532 | snprintf(devpath, sizeof(devpath), "usb\\%d-%s", | 532 | snprintf(devpath, sizeof(devpath), "usb\\%d-%s", |
533 | udev->bus->busnum, udev->devpath); | 533 | udev->bus->busnum, udev->devpath); |
534 | sms_info("stellar device in cold state was found at %s.", devpath); | 534 | pr_info("stellar device in cold state was found at %s.\n", |
535 | devpath); | ||
535 | rc = smsusb1_load_firmware( | 536 | rc = smsusb1_load_firmware( |
536 | udev, smscore_registry_getmode(devpath), | 537 | udev, smscore_registry_getmode(devpath), |
537 | id->driver_info); | 538 | id->driver_info); |
538 | 539 | ||
539 | /* This device will reset and gain another USB ID */ | 540 | /* This device will reset and gain another USB ID */ |
540 | if (!rc) | 541 | if (!rc) |
541 | sms_info("stellar device now in warm state"); | 542 | pr_info("stellar device now in warm state\n"); |
542 | else | 543 | else |
543 | pr_err("Failed to put stellar in warm state. Error: %d\n", | 544 | pr_err("Failed to put stellar in warm state. Error: %d\n", |
544 | rc); | 545 | rc); |
@@ -548,7 +549,7 @@ static int smsusb_probe(struct usb_interface *intf, | |||
548 | rc = smsusb_init_device(intf, id->driver_info); | 549 | rc = smsusb_init_device(intf, id->driver_info); |
549 | } | 550 | } |
550 | 551 | ||
551 | sms_info("Device initialized with return code %d", rc); | 552 | pr_info("Device initialized with return code %d\n", rc); |
552 | sms_board_load_modules(id->driver_info); | 553 | sms_board_load_modules(id->driver_info); |
553 | return rc; | 554 | return rc; |
554 | } | 555 | } |