Received-SPF: pass (google.com: domain of vatikaharlalka@gmail.com designates 2607:f8b0:400e:c02::22d as permitted sender) client-ip=2607:f8b0:400e:c02::22d;
Date: Mon, 2 Mar 2015 16:47:56 +0530
From: Vatika Harlalka <vatikaharlalka@gmail.com>
To: outreachy-kernel@googlegroups.com
Subject: [PATCH] Staging: comedi: Replace if-else with ternary operator
Message-ID: <20150302111756.GA17499@akanksha>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)

This patch uses Coccinelle script to replace the if-else
block with ternary operator to make it more compact.

Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
---
 drivers/staging/comedi/drivers.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index f32e714..8fda5f3 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -363,8 +363,7 @@ unsigned int comedi_nscans_left(struct comedi_subdevice *s,
 		if (async->scans_done < cmd->stop_arg)
 			scans_left = cmd->stop_arg - async->scans_done;
 
-		if (nscans > scans_left)
-			nscans = scans_left;
+		nscans = (nscans <= scans_left) ? nscans : scans_left;
 	}
 	return nscans;
 }
@@ -397,8 +396,7 @@ unsigned int comedi_nsamples_left(struct comedi_subdevice *s,
 					cmd->scan_end_arg) - scan_pos;
 		}
 
-		if (samples_left < nsamples)
-			nsamples = samples_left;
+		nsamples = (nsamples <= samples_left) ? nsamples : samples_left;
 	}
 	return nsamples;
 }
@@ -540,8 +538,7 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev,
 
 	async->max_bufsize = comedi_default_buf_maxsize_kb * 1024;
 	buf_size = comedi_default_buf_size_kb * 1024;
-	if (buf_size > async->max_bufsize)
-		buf_size = async->max_bufsize;
+	buf_size = (buf_size <= async->max_bufsize) ? buf_size : async->max_bufsize;
 
 	if (comedi_buf_alloc(dev, s, buf_size) < 0) {
 		dev_warn(dev->class_dev, "Buffer allocation failed\n");
-- 
1.9.1