From b9183fdd4121c2480855b6ded32cdd359ad6b710 Mon Sep 17 00:00:00 2001 From: Alison Schofield Date: Fri, 12 Feb 2016 10:44:43 -0800 Subject: [PATCH] staging: vt6656: move local var init into declaration Improve readability by initializing local variables at declaration. In one instance, vnt_start_interrupt_urb_complete(), also use that local variable in subsequent switch. Signed-off-by: Alison Schofield Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/usbpipe.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index bec5bafaca3c..f27eb9a8d249 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -101,9 +101,9 @@ void vnt_control_in_u8(struct vnt_private *priv, u8 reg, u8 reg_off, u8 *data) static void vnt_start_interrupt_urb_complete(struct urb *urb) { struct vnt_private *priv = urb->context; - int status; + int status = urb->status; - switch (urb->status) { + switch (status) { case 0: case -ETIMEDOUT: break; @@ -116,8 +116,6 @@ static void vnt_start_interrupt_urb_complete(struct urb *urb) break; } - status = urb->status; - if (status != STATUS_SUCCESS) { priv->int_buf.in_use = false; @@ -207,9 +205,8 @@ static void vnt_submit_rx_urb_complete(struct urb *urb) int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb) { int status = 0; - struct urb *urb; + struct urb *urb = rcb->urb; - urb = rcb->urb; if (!rcb->skb) { dev_dbg(&priv->usb->dev, "rcb->skb is null\n"); return status; @@ -269,15 +266,13 @@ int vnt_tx_context(struct vnt_private *priv, struct vnt_usb_send_context *context) { int status; - struct urb *urb; + struct urb *urb = context->urb; if (test_bit(DEVICE_FLAGS_DISCONNECTED, &priv->flags)) { context->in_use = false; return STATUS_RESOURCES; } - urb = context->urb; - usb_fill_bulk_urb(urb, priv->usb, usb_sndbulkpipe(priv->usb, 3), -- 2.20.1