Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937595AbdLSO5e (ORCPT ); Tue, 19 Dec 2017 09:57:34 -0500 Received: from mail.CARNet.hr ([161.53.123.6]:60496 "EHLO mail.carnet.hr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936702AbdLSO4g (ORCPT ); Tue, 19 Dec 2017 09:56:36 -0500 From: Valentin Vidic To: Greg Kroah-Hartman Cc: Dan Carpenter , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Marcin Ciupak , Marcus Wolf , =?UTF-8?q?Simon=20Sandstr=C3=B6m?= , Marcus Wolf , Valentin Vidic Date: Tue, 19 Dec 2017 15:56:18 +0100 Message-Id: <20171219145623.24023-1-Valentin.Vidic@CARNet.hr> X-Mailer: git-send-email 2.15.0 X-SA-Exim-Connect-IP: 161.53.12.131 Subject: [PATCH 1/6 v5] staging: pi433: collapse else block after return statement X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1526 Lines: 49 Fixes checkpatch warning: WARNING: else is not generally useful after a break or return Signed-off-by: Valentin Vidic --- v5: resend patchset based on comments drivers/staging/pi433/pi433_if.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c index b4e6094ad553..02887988d2ea 100644 --- a/drivers/staging/pi433/pi433_if.c +++ b/drivers/staging/pi433/pi433_if.c @@ -773,11 +773,11 @@ pi433_read(struct file *filp, char __user *buf, size_t size, loff_t *f_pos) if (device->rx_active) { mutex_unlock(&device->rx_lock); return -EAGAIN; - } else { - device->rx_active = true; - mutex_unlock(&device->rx_lock); } + device->rx_active = true; + mutex_unlock(&device->rx_lock); + /* start receiving */ /* will block until something was received*/ device->rx_buffer_size = size; @@ -1117,12 +1117,12 @@ static int pi433_probe(struct spi_device *spi) if (retval) { dev_dbg(&spi->dev, "configuration of SPI interface failed!\n"); return retval; - } else { - dev_dbg(&spi->dev, - "spi interface setup: mode 0x%2x, %d bits per word, %dhz max speed", - spi->mode, spi->bits_per_word, spi->max_speed_hz); } + dev_dbg(&spi->dev, + "spi interface setup: mode 0x%2x, %d bits per word, %dhz max speed", + spi->mode, spi->bits_per_word, spi->max_speed_hz); + /* Ping the chip by reading the version register */ retval = spi_w8r8(spi, 0x10); if (retval < 0) -- 2.15.0