From 3170f3277b1809c19fe4a45914cffa0e09471973 Mon Sep 17 00:00:00 2001 From: Tina Johnson Date: Wed, 17 Sep 2014 03:14:52 +0530 Subject: [PATCH] Staging: media: lirc: lirc_imon: Removed unnecessary variable to simplify return variable handling Variable rc was removed after merging its assignment statement with immediately following return statement. Variable retval is not used at all other that to return its initial value.Hence replaced retval with its initial value in the return statement and removed the variable. This patch was done using Coccinelle script and the following semantic patch was used: @rule1@ identifier ret; expression e; @@ -int ret = 0; ... when != ret ( -ret = e; +return e; -return ret; | -return ret; +return 0; ) Signed-off-by: Tina Johnson Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/lirc/lirc_imon.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c index 96c76b33770b..06ec24cb23b3 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; } /** @@ -1021,7 +1020,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 +1029,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); -- 2.20.1