staging: ced1401: fix ced_writechar_callback()
Rename camel case locals in function ced_writechar_callback() Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9982440a5a
commit
ae42e3081d
1 changed files with 18 additions and 18 deletions
|
@ -260,24 +260,24 @@ static bool can_accept_io_requests(struct ced_data *ced)
|
||||||
** Callback routine to complete writes. This may need to fire off another
|
** Callback routine to complete writes. This may need to fire off another
|
||||||
** urb to complete the transfer.
|
** urb to complete the transfer.
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
static void ced_writechar_callback(struct urb *pUrb)
|
static void ced_writechar_callback(struct urb *urb)
|
||||||
{
|
{
|
||||||
struct ced_data *ced = pUrb->context;
|
struct ced_data *ced = urb->context;
|
||||||
int nGot = pUrb->actual_length; /* what we transferred */
|
int got = urb->actual_length; /* what we transferred */
|
||||||
|
|
||||||
if (pUrb->status) { /* sync/async unlink faults aren't errors */
|
if (urb->status) { /* sync/async unlink faults aren't errors */
|
||||||
if (!
|
if (!
|
||||||
(pUrb->status == -ENOENT || pUrb->status == -ECONNRESET
|
(urb->status == -ENOENT || urb->status == -ECONNRESET
|
||||||
|| pUrb->status == -ESHUTDOWN)) {
|
|| urb->status == -ESHUTDOWN)) {
|
||||||
dev_err(&ced->interface->dev,
|
dev_err(&ced->interface->dev,
|
||||||
"%s: nonzero write bulk status received: %d\n",
|
"%s: nonzero write bulk status received: %d\n",
|
||||||
__func__, pUrb->status);
|
__func__, urb->status);
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_lock(&ced->err_lock);
|
spin_lock(&ced->err_lock);
|
||||||
ced->errors = pUrb->status;
|
ced->errors = urb->status;
|
||||||
spin_unlock(&ced->err_lock);
|
spin_unlock(&ced->err_lock);
|
||||||
nGot = 0; /* and tidy up again if so */
|
got = 0; /* and tidy up again if so */
|
||||||
|
|
||||||
spin_lock(&ced->char_out_lock); /* already at irq level */
|
spin_lock(&ced->char_out_lock); /* already at irq level */
|
||||||
ced->out_buff_get = 0; /* Reset the output buffer */
|
ced->out_buff_get = 0; /* Reset the output buffer */
|
||||||
|
@ -290,16 +290,16 @@ static void ced_writechar_callback(struct urb *pUrb)
|
||||||
"%s: char out done, 0 chars sent\n", __func__);
|
"%s: char out done, 0 chars sent\n", __func__);
|
||||||
} else {
|
} else {
|
||||||
dev_dbg(&ced->interface->dev,
|
dev_dbg(&ced->interface->dev,
|
||||||
"%s: char out done, %d chars sent\n", __func__, nGot);
|
"%s: char out done, %d chars sent\n", __func__, got);
|
||||||
spin_lock(&ced->char_out_lock); /* already at irq level */
|
spin_lock(&ced->char_out_lock); /* already at irq level */
|
||||||
ced->num_output -= nGot; /* Now adjust the char send buffer */
|
ced->num_output -= got; /* Now adjust the char send buffer */
|
||||||
ced->out_buff_get += nGot; /* to match what we did */
|
ced->out_buff_get += got; /* to match what we did */
|
||||||
if (ced->out_buff_get >= OUTBUF_SZ) /* Can't do this any earlier as data could be overwritten */
|
if (ced->out_buff_get >= OUTBUF_SZ) /* Can't do this any earlier as data could be overwritten */
|
||||||
ced->out_buff_get = 0;
|
ced->out_buff_get = 0;
|
||||||
|
|
||||||
if (ced->num_output > 0) { /* if more to be done... */
|
if (ced->num_output > 0) { /* if more to be done... */
|
||||||
int nPipe = 0; /* The pipe number to use */
|
int pipe = 0; /* The pipe number to use */
|
||||||
int iReturn;
|
int ret;
|
||||||
char *pDat = &ced->output_buffer[ced->out_buff_get];
|
char *pDat = &ced->output_buffer[ced->out_buff_get];
|
||||||
unsigned int dwCount = ced->num_output; /* maximum to send */
|
unsigned int dwCount = ced->num_output; /* maximum to send */
|
||||||
if ((ced->out_buff_get + dwCount) > OUTBUF_SZ) /* does it cross buffer end? */
|
if ((ced->out_buff_get + dwCount) > OUTBUF_SZ) /* does it cross buffer end? */
|
||||||
|
@ -317,17 +317,17 @@ static void ced_writechar_callback(struct urb *pUrb)
|
||||||
ced->urb_char_out->transfer_flags |=
|
ced->urb_char_out->transfer_flags |=
|
||||||
URB_NO_TRANSFER_DMA_MAP;
|
URB_NO_TRANSFER_DMA_MAP;
|
||||||
usb_anchor_urb(ced->urb_char_out, &ced->submitted); /* in case we need to kill it */
|
usb_anchor_urb(ced->urb_char_out, &ced->submitted); /* in case we need to kill it */
|
||||||
iReturn = usb_submit_urb(ced->urb_char_out, GFP_ATOMIC);
|
ret = usb_submit_urb(ced->urb_char_out, GFP_ATOMIC);
|
||||||
dev_dbg(&ced->interface->dev, "%s: n=%d>%s<\n",
|
dev_dbg(&ced->interface->dev, "%s: n=%d>%s<\n",
|
||||||
__func__, dwCount, pDat);
|
__func__, dwCount, pDat);
|
||||||
spin_lock(&ced->char_out_lock); /* grab lock for errors */
|
spin_lock(&ced->char_out_lock); /* grab lock for errors */
|
||||||
if (iReturn) {
|
if (ret) {
|
||||||
ced->pipe_error[nPipe] = 1; /* Flag an error to be handled later */
|
ced->pipe_error[pipe] = 1; /* Flag an error to be handled later */
|
||||||
ced->send_chars_pending = false; /* Allow other threads again */
|
ced->send_chars_pending = false; /* Allow other threads again */
|
||||||
usb_unanchor_urb(ced->urb_char_out);
|
usb_unanchor_urb(ced->urb_char_out);
|
||||||
dev_err(&ced->interface->dev,
|
dev_err(&ced->interface->dev,
|
||||||
"%s: usb_submit_urb() returned %d\n",
|
"%s: usb_submit_urb() returned %d\n",
|
||||||
__func__, iReturn);
|
__func__, ret);
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
/* Allow other threads again */
|
/* Allow other threads again */
|
||||||
|
|
Loading…
Add table
Reference in a new issue