From: Varsha Rao Date: Sun, 12 Mar 2017 15:07:30 +0000 (+0530) Subject: staging: comedi: Compress return logic into one line. X-Git-Tag: v4.12-rc1~84^2~561 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=06cb6b5434937180251d0ddb3d9a4cb2af6015da;p=karo-tx-linux.git staging: comedi: Compress return logic into one line. Simplify function return by merging assignment and return into a single line. The following coccinelle script is used to fix this issue. @@ expression e; local idexpression ret; @@ -ret = e; -return ret; +return e; Signed-off-by: Varsha Rao Acked-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 3b98193de0a4..b761f000c1dc 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -1417,9 +1417,7 @@ static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples) if (retval < 0) return retval; - num_samples = retval * fifo->num_segments * fifo->sample_packing_ratio; - - return num_samples; + return retval * fifo->num_segments * fifo->sample_packing_ratio; } /* query length of fifo */