From: Heena Sirwani <heenasirwani@gmail.com>
Date: Mon, 6 Oct 2014 08:16:09 +0000 (+0530)
Subject: Staging: comedi: Compressed two lines of code into one.
X-Git-Tag: firefly_0821_release~176^2~2665^2~1248
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe43ec5350d34244dedf3e6647f991f7c348c82d;p=firefly-linux-kernel-4.4.55.git

Staging: comedi: Compressed two lines of code into one.

The following patch compressed two lines of code into one using
coccinelle and removed an unused variable.
The semantic patch used is as follows:

@@
expression ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 495969f46e76..224af2b2a685 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -1718,7 +1718,6 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg,
 			   void *file)
 {
 	struct comedi_subdevice *s;
-	int ret;
 
 	if (arg >= dev->n_subdevices)
 		return -EINVAL;
@@ -1732,9 +1731,7 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg,
 	if (s->busy != file)
 		return -EBUSY;
 
-	ret = do_cancel(dev, s);
-
-	return ret;
+	return do_cancel(dev, s);
 }
 
 /*