system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-10 13:24:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging:go7007:Replace KERN_ERR with pr_err

Browse source 
Replace KERN_ERR with pr_err in go7007-usb.c

Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dulshani Gunawardhana 2013-10-09 11:58:54 +05:30 committed by Greg Kroah-Hartman
parent 68095f1803
commit 335ade0909
1 changed files with 21 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
drivers/staging/media/go7007/go7007-usb.c
View file

@ -677,8 +677,7 @@ static int go7007_usb_interface_reset(struct go7007 *go)
/* Wait for an interrupt to indicate successful hardware reset */ /* Wait for an interrupt to indicate successful hardware reset */
if (go7007_read_interrupt(go, &intr_val, &intr_data) < 0 || if (go7007_read_interrupt(go, &intr_val, &intr_data) < 0 ||
(intr_val & ~0x1) != 0x55aa) { (intr_val & ~0x1) != 0x55aa) {
printk(KERN_ERR pr_err("unable to reset the USB interface\n");
"go7007-usb: unable to reset the USB interface\n");
return -1; return -1;
} }
return 0; return 0;
@ -710,9 +709,7 @@ static int go7007_usb_ezusb_write_interrupt(struct go7007 *go,
if (r < 0) if (r < 0)
goto write_int_error; goto write_int_error;
if (i == 100) { if (i == 100) {
printk(KERN_ERR pr_err("device is hung, status reg = 0x%04x\n", status_reg);
"go7007-usb: device is hung, status reg = 0x%04x\n",
status_reg);
return -1; return -1;
} }
r = usb_control_msg(usb->usbdev, usb_sndctrlpipe(usb->usbdev, 0), 0x12, r = usb_control_msg(usb->usbdev, usb_sndctrlpipe(usb->usbdev, 0), 0x12,
@ -728,7 +725,7 @@ static int go7007_usb_ezusb_write_interrupt(struct go7007 *go,
return 0; return 0;
write_int_error: write_int_error:
printk(KERN_ERR "go7007-usb: error in WriteInterrupt: %d\n", r); pr_err("error in WriteInterrupt: %d\n", r);
return r; return r;
} }
@ -750,7 +747,7 @@ static int go7007_usb_onboard_write_interrupt(struct go7007 *go,
USB_TYPE_VENDOR | USB_RECIP_ENDPOINT, 0x55aa, USB_TYPE_VENDOR | USB_RECIP_ENDPOINT, 0x55aa,
0xf0f0, go->usb_buf, 8, timeout); 0xf0f0, go->usb_buf, 8, timeout);
if (r < 0) { if (r < 0) {
printk(KERN_ERR "go7007-usb: error in WriteInterrupt: %d\n", r); pr_err("error in WriteInterrupt: %d\n", r);
return r; return r;
} }
return 0; return 0;
@ -765,15 +762,13 @@ static void go7007_usb_readinterrupt_complete(struct urb *urb)
if (status) { if (status) {
if (status != -ESHUTDOWN && if (status != -ESHUTDOWN &&
go->status != STATUS_SHUTDOWN) { go->status != STATUS_SHUTDOWN) {
printk(KERN_ERR pr_err("error in read interrupt: %d\n", urb->status);
"go7007-usb: error in read interrupt: %d\n",
urb->status);
} else { } else {
wake_up(&go->interrupt_waitq); wake_up(&go->interrupt_waitq);
return; return;
} }
} else if (urb->actual_length != urb->transfer_buffer_length) { } else if (urb->actual_length != urb->transfer_buffer_length) {
printk(KERN_ERR "go7007-usb: short read in interrupt pipe!\n"); pr_err("short read in interrupt pipe!\n");
} else { } else {
go->interrupt_available = 1; go->interrupt_available = 1;
go->interrupt_data = __le16_to_cpu(regs[0]); go->interrupt_data = __le16_to_cpu(regs[0]);
@ -792,8 +787,7 @@ static int go7007_usb_read_interrupt(struct go7007 *go)
r = usb_submit_urb(usb->intr_urb, GFP_KERNEL); r = usb_submit_urb(usb->intr_urb, GFP_KERNEL);
if (r < 0) { if (r < 0) {
printk(KERN_ERR pr_err("unable to submit interrupt urb: %d\n", r);
"go7007-usb: unable to submit interrupt urb: %d\n", r);
return r; return r;
} }
return 0; return 0;
@ -809,18 +803,17 @@ static void go7007_usb_read_video_pipe_complete(struct urb *urb)
return; return;
} }
if (status) { if (status) {
printk(KERN_ERR "go7007-usb: error in video pipe: %d\n", pr_err("error in video pipe: %d\n", status);
status);
return; return;
} }
if (urb->actual_length != urb->transfer_buffer_length) { if (urb->actual_length != urb->transfer_buffer_length) {
printk(KERN_ERR "go7007-usb: short read in video pipe!\n"); pr_err("short read in video pipe!\n");
return; return;
} }
go7007_parse_video_stream(go, urb->transfer_buffer, urb->actual_length); go7007_parse_video_stream(go, urb->transfer_buffer, urb->actual_length);
r = usb_submit_urb(urb, GFP_ATOMIC); r = usb_submit_urb(urb, GFP_ATOMIC);
if (r < 0) if (r < 0)
printk(KERN_ERR "go7007-usb: error in video pipe: %d\n", r); pr_err("error in video pipe: %d\n", r);
} }
static void go7007_usb_read_audio_pipe_complete(struct urb *urb) static void go7007_usb_read_audio_pipe_complete(struct urb *urb)
@ -831,19 +824,19 @@ static void go7007_usb_read_audio_pipe_complete(struct urb *urb)
if (!vb2_is_streaming(&go->vidq)) if (!vb2_is_streaming(&go->vidq))
return; return;
if (status) { if (status) {
printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n", pr_err("error in audio pipe: %d\n",
status); status);
return; return;
} }
if (urb->actual_length != urb->transfer_buffer_length) { if (urb->actual_length != urb->transfer_buffer_length) {
printk(KERN_ERR "go7007-usb: short read in audio pipe!\n"); pr_err("short read in audio pipe!\n");
return; return;
} }
if (go->audio_deliver != NULL) if (go->audio_deliver != NULL)
go->audio_deliver(go, urb->transfer_buffer, urb->actual_length); go->audio_deliver(go, urb->transfer_buffer, urb->actual_length);
r = usb_submit_urb(urb, GFP_ATOMIC); r = usb_submit_urb(urb, GFP_ATOMIC);
if (r < 0) if (r < 0)
printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n", r); pr_err("error in audio pipe: %d\n", r);
} }
static int go7007_usb_stream_start(struct go7007 *go) static int go7007_usb_stream_start(struct go7007 *go)
@ -854,8 +847,7 @@ static int go7007_usb_stream_start(struct go7007 *go)
for (i = 0; i < 8; ++i) { for (i = 0; i < 8; ++i) {
r = usb_submit_urb(usb->video_urbs[i], GFP_KERNEL); r = usb_submit_urb(usb->video_urbs[i], GFP_KERNEL);
if (r < 0) { if (r < 0) {
printk(KERN_ERR "go7007-usb: error submitting video " pr_err("error submitting video urb %d: %d\n", i, r);
"urb %d: %d\n", i, r);
goto video_submit_failed; goto video_submit_failed;
} }
} }
@ -865,8 +857,7 @@ static int go7007_usb_stream_start(struct go7007 *go)
for (i = 0; i < 8; ++i) { for (i = 0; i < 8; ++i) {
r = usb_submit_urb(usb->audio_urbs[i], GFP_KERNEL); r = usb_submit_urb(usb->audio_urbs[i], GFP_KERNEL);
if (r < 0) { if (r < 0) {
printk(KERN_ERR "go7007-usb: error submitting audio " pr_err("error submitting audio urb %d: %d\n", i, r);
"urb %d: %d\n", i, r);
goto audio_submit_failed; goto audio_submit_failed;
} }
} }
@ -1111,7 +1102,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
board = &board_px_tv402u; board = &board_px_tv402u;
break; break;
case GO7007_BOARDID_LIFEVIEW_LR192: case GO7007_BOARDID_LIFEVIEW_LR192:
printk(KERN_ERR "go7007-usb: The Lifeview TV Walker Ultra " pr_err("The Lifeview TV Walker Ultra "
"is not supported. Sorry!\n"); "is not supported. Sorry!\n");
return -ENODEV; return -ENODEV;
name = "Lifeview TV Walker Ultra"; name = "Lifeview TV Walker Ultra";
@ -1127,7 +1118,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
board = &board_ads_usbav_709; board = &board_ads_usbav_709;
break; break;
default: default:
printk(KERN_ERR "go7007-usb: unknown board ID %d!\n", pr_err("unknown board ID %d!\n",
(unsigned int)id->driver_info); (unsigned int)id->driver_info);
return -ENODEV; return -ENODEV;
} }
@ -1186,8 +1177,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
go->i2c_adapter.dev.parent = go->dev; go->i2c_adapter.dev.parent = go->dev;
i2c_set_adapdata(&go->i2c_adapter, go); i2c_set_adapdata(&go->i2c_adapter, go);
if (i2c_add_adapter(&go->i2c_adapter) < 0) { if (i2c_add_adapter(&go->i2c_adapter) < 0) {
printk(KERN_ERR pr_err("error: i2c_add_adapter failed\n");
"go7007-usb: error: i2c_add_adapter failed\n");
goto allocfail; goto allocfail;
} }
go->i2c_adapter_online = 1; go->i2c_adapter_online = 1;
@ -1238,7 +1228,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
if (go->board_id == GO7007_BOARDID_PX_TV402U) { if (go->board_id == GO7007_BOARDID_PX_TV402U) {
/* Board strapping indicates tuner model */ /* Board strapping indicates tuner model */
if (go7007_usb_vendor_request(go, 0x41, 0, 0, go->usb_buf, 3, 1) < 0) { if (go7007_usb_vendor_request(go, 0x41, 0, 0, go->usb_buf, 3, 1) < 0) {
printk(KERN_ERR "go7007-usb: GPIO read failed!\n"); pr_err("GPIO read failed!\n");
goto allocfail; goto allocfail;
} }
switch (go->usb_buf[0] >> 6) { switch (go->usb_buf[0] >> 6) {
@ -1270,7 +1260,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
* to the EZ-USB GPIO output pins */ * to the EZ-USB GPIO output pins */
if (go7007_usb_vendor_request(go, 0x40, 0x7f02, 0, if (go7007_usb_vendor_request(go, 0x40, 0x7f02, 0,
NULL, 0, 0) < 0) { NULL, 0, 0) < 0) {
printk(KERN_ERR "go7007-usb: GPIO write failed!\n"); pr_err("GPIO write failed!\n");
goto allocfail; goto allocfail;
} }
} }
@ -1279,7 +1269,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
* a USB1.1 port. There will be silent corruption of the stream. */ * a USB1.1 port. There will be silent corruption of the stream. */
if ((board->flags & GO7007_USB_EZUSB) && if ((board->flags & GO7007_USB_EZUSB) &&
usbdev->speed != USB_SPEED_HIGH) usbdev->speed != USB_SPEED_HIGH)
printk(KERN_ERR "go7007-usb: *** WARNING *** This device " pr_err("*** WARNING *** This device "
"must be connected to a USB 2.0 port! " "must be connected to a USB 2.0 port! "
"Attempting to capture video through a USB 1.1 " "Attempting to capture video through a USB 1.1 "
"port will result in stream corruption, even " "port will result in stream corruption, even "