From: Catalina Mocanu Date: Fri, 19 Sep 2014 22:55:05 +0000 (-0700) Subject: staging: iio: cdc: Don't put an else right after a return X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=288903f6b91e759b0a813219acd376426cbb8f14;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git staging: iio: cdc: Don't put an else right after a return This fixes the following checkpatch.pl warning: WARNING: else is not generally useful after a break or return. While at it, remove new line for symmetry with the rest of the code. Signed-off-by: Catalina Mocanu Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c index 047af2376300..a2b7ae3329c0 100644 --- a/drivers/staging/iio/cdc/ad7150.c +++ b/drivers/staging/iio/cdc/ad7150.c @@ -143,19 +143,15 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev, case IIO_EV_TYPE_MAG_ADAPTIVE: if (dir == IIO_EV_DIR_RISING) return adaptive && (threshtype == 0x1); - else - return adaptive && (threshtype == 0x0); + return adaptive && (threshtype == 0x0); case IIO_EV_TYPE_THRESH_ADAPTIVE: if (dir == IIO_EV_DIR_RISING) return adaptive && (threshtype == 0x3); - else - return adaptive && (threshtype == 0x2); - + return adaptive && (threshtype == 0x2); case IIO_EV_TYPE_THRESH: if (dir == IIO_EV_DIR_RISING) return !adaptive && (threshtype == 0x1); - else - return !adaptive && (threshtype == 0x0); + return !adaptive && (threshtype == 0x0); default: break; }