openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: es1/es2: clean up error messages 

Replace the remaining pr_err with dev_err, and drop redundant function
prefixes.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2015-10-13 19:10:20 +02:00 committed by Greg Kroah-Hartman
parent 67b81757da
commit 305a031e1a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/greybus/es1.c
View File

@ -193,7 +193,8 @@ static int message_send(struct greybus_host_device *hd, u16 cport_id,
* the target CPort id before filling it in. * the target CPort id before filling it in.
*/ */
if (!cport_id_valid(hd, cport_id)) { if (!cport_id_valid(hd, cport_id)) {
pr_err("invalid destination cport 0x%02x\n", cport_id); dev_err(&udev->dev, "invalid destination cport 0x%02x\n",
cport_id);
return -EINVAL; return -EINVAL;
} }
@ -219,7 +220,7 @@ static int message_send(struct greybus_host_device *hd, u16 cport_id,
trace_gb_host_device_send(hd, cport_id, buffer_size); trace_gb_host_device_send(hd, cport_id, buffer_size);
retval = usb_submit_urb(urb, gfp_mask); retval = usb_submit_urb(urb, gfp_mask);
if (retval) { if (retval) {
pr_err("error %d submitting URB\n", retval); dev_err(&udev->dev, "failed to submit out-urb: %d\n", retval);
spin_lock_irqsave(&es1->cport_out_urb_lock, flags); spin_lock_irqsave(&es1->cport_out_urb_lock, flags);
message->hcpriv = NULL; message->hcpriv = NULL;
@ -363,7 +364,7 @@ static void cport_in_callback(struct urb *urb)
} }
if (urb->actual_length < sizeof(*header)) { if (urb->actual_length < sizeof(*header)) {
dev_err(dev, "%s: short message received\n", __func__); dev_err(dev, "short message received\n");
goto exit; goto exit;
} }
@ -376,15 +377,13 @@ static void cport_in_callback(struct urb *urb)
greybus_data_rcvd(hd, cport_id, urb->transfer_buffer, greybus_data_rcvd(hd, cport_id, urb->transfer_buffer,
urb->actual_length); urb->actual_length);
} else { } else {
dev_err(dev, "%s: invalid cport id 0x%02x received\n", dev_err(dev, "invalid cport id 0x%02x received\n", cport_id);
__func__, cport_id);
} }
exit: exit:
/* put our urb back in the request pool */ /* put our urb back in the request pool */
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
dev_err(dev, "%s: error %d in submitting urb.\n", dev_err(dev, "failed to resubmit in-urb: %d\n", retval);
__func__, retval);
} }
static void cport_out_callback(struct urb *urb) static void cport_out_callback(struct urb *urb)

13
drivers/staging/greybus/es2.c
View File

@ -298,7 +298,8 @@ static int message_send(struct greybus_host_device *hd, u16 cport_id,
* the target CPort id before filling it in. * the target CPort id before filling it in.
*/ */
if (!cport_id_valid(hd, cport_id)) { if (!cport_id_valid(hd, cport_id)) {
pr_err("invalid destination cport 0x%02x\n", cport_id); dev_err(&udev->dev, "invalid destination cport 0x%02x\n",
cport_id);
return -EINVAL; return -EINVAL;
} }
@ -326,7 +327,7 @@ static int message_send(struct greybus_host_device *hd, u16 cport_id,
trace_gb_host_device_send(hd, cport_id, buffer_size); trace_gb_host_device_send(hd, cport_id, buffer_size);
retval = usb_submit_urb(urb, gfp_mask); retval = usb_submit_urb(urb, gfp_mask);
if (retval) { if (retval) {
pr_err("error %d submitting URB\n", retval); dev_err(&udev->dev, "failed to submit out-urb: %d\n", retval);
spin_lock_irqsave(&es1->cport_out_urb_lock, flags); spin_lock_irqsave(&es1->cport_out_urb_lock, flags);
message->hcpriv = NULL; message->hcpriv = NULL;
@ -509,7 +510,7 @@ static void cport_in_callback(struct urb *urb)
} }
if (urb->actual_length < sizeof(*header)) { if (urb->actual_length < sizeof(*header)) {
dev_err(dev, "%s: short message received\n", __func__); dev_err(dev, "short message received\n");
goto exit; goto exit;
} }
@ -522,15 +523,13 @@ static void cport_in_callback(struct urb *urb)
greybus_data_rcvd(hd, cport_id, urb->transfer_buffer, greybus_data_rcvd(hd, cport_id, urb->transfer_buffer,
urb->actual_length); urb->actual_length);
} else { } else {
dev_err(dev, "%s: invalid cport id 0x%02x received\n", dev_err(dev, "invalid cport id 0x%02x received\n", cport_id);
__func__, cport_id);
} }
exit: exit:
/* put our urb back in the request pool */ /* put our urb back in the request pool */
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
dev_err(dev, "%s: error %d in submitting urb.\n", dev_err(dev, "failed to resubmit in-urb: %d\n", retval);
__func__, retval);
} }
static void cport_out_callback(struct urb *urb) static void cport_out_callback(struct urb *urb)