diff options
Diffstat (limited to 'drivers/staging/media/lirc/lirc_imon.c')
| -rw-r--r-- | drivers/staging/media/lirc/lirc_imon.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c index 96c76b33770b..726cc3a31856 100644 --- a/drivers/staging/media/lirc/lirc_imon.c +++ b/drivers/staging/media/lirc/lirc_imon.c @@ -489,7 +489,6 @@ static void usb_tx_callback(struct urb *urb) */ static int ir_open(void *data) { - int retval = 0; struct imon_context *context; /* prevent races with disconnect */ @@ -506,7 +505,7 @@ static int ir_open(void *data) dev_info(context->driver->dev, "IR port opened\n"); mutex_unlock(&driver_lock); - return retval; + return 0; } /** @@ -615,8 +614,8 @@ static void imon_incoming_packet(struct imon_context *context, return; if (len != 8) { - dev_warn(dev, "imon %s: invalid incoming packet " - "size (len = %d, intf%d)\n", __func__, len, intf); + dev_warn(dev, "imon %s: invalid incoming packet size (len = %d, intf%d)\n", + __func__, len, intf); return; } @@ -925,9 +924,8 @@ static int imon_probe(struct usb_interface *interface, } } - dev_info(dev, "iMON device (%04x:%04x, intf%d) on " - "usb<%d:%d> initialized\n", vendor, product, ifnum, - usbdev->bus->busnum, usbdev->devnum); + dev_info(dev, "iMON device (%04x:%04x, intf%d) on usb<%d:%d> initialized\n", + vendor, product, ifnum, usbdev->bus->busnum, usbdev->devnum); unlock: mutex_unlock(&context->ctx_lock); @@ -1021,7 +1019,6 @@ static int imon_suspend(struct usb_interface *intf, pm_message_t message) static int imon_resume(struct usb_interface *intf) { - int rc = 0; struct imon_context *context = usb_get_intfdata(intf); usb_fill_int_urb(context->rx_urb, context->usbdev, @@ -1031,9 +1028,7 @@ static int imon_resume(struct usb_interface *intf) usb_rx_callback, context, context->rx_endpoint->bInterval); - rc = usb_submit_urb(context->rx_urb, GFP_ATOMIC); - - return rc; + return usb_submit_urb(context->rx_urb, GFP_ATOMIC); } module_usb_driver(imon_driver); |