From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 922D9C4646B for ; Wed, 26 Jun 2019 07:36:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 686442133F for ; Wed, 26 Jun 2019 07:36:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=fau.de header.i=@fau.de header.b="gzArvgZg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbfFZHgH (ORCPT ); Wed, 26 Jun 2019 03:36:07 -0400 Received: from mx-rz-3.rrze.uni-erlangen.de ([131.188.11.22]:58793 "EHLO mx-rz-3.rrze.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725876AbfFZHgG (ORCPT ); Wed, 26 Jun 2019 03:36:06 -0400 Received: from mx-exchlnx-3.rrze.uni-erlangen.de (mx-exchlnx-3.rrze.uni-erlangen.de [IPv6:2001:638:a000:1025::39]) by mx-rz-3.rrze.uni-erlangen.de (Postfix) with ESMTP id 45YZZr4v4Wz1yxX; Wed, 26 Jun 2019 09:36:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fau.de; s=fau-2013; t=1561534564; bh=hPitCSw1O9f9+6vfkcT5ctD6TWJ4ycTjy6W4y7qV+o4=; h=From:To:CC:Subject:Date:In-Reply-To:References:From:To:CC: Subject; b=gzArvgZgoz6KyBm8m6Q45W7inMTxavjQN9hHdLysHuuQeKsYfJZVz3aIstOnHNTPK H0r9GD48D5L7egpefwwLhFf2vJsHy12FDXHgJeRzh87pIBGpoJILc86ZfXzhH4bPKm lWHB/NnNIAJsI2gdvHnnKp3+WYy8KE3UMQcU7BUpP/T4LvOI58YDLMNS6nYrPhw4+5 9MjmeJlvV8nKEcesBLsjBW7s7PRDCSo4c3XW1VQastMVm3asH5joPlh2ydesNUUtg1 6m7zFVHjVXql25yVZiHboZXQTSjjhuYKZPi+acGZ/k7UAoYQzZjL44qhlJXbkBo12l RAe9JXHM5oKPg== X-Virus-Scanned: amavisd-new at boeck2.rrze.uni-erlangen.de (RRZE) X-RRZE-Flag: Not-Spam Received: from hbt1.exch.fau.de (hbt1.exch.fau.de [10.15.8.13]) by mx-exchlnx-3.rrze.uni-erlangen.de (Postfix) with ESMTP id 45YZZp2tJ3z1y2j; Wed, 26 Jun 2019 09:36:02 +0200 (CEST) Received: from MBX3.exch.uni-erlangen.de (10.15.8.45) by hbt1.exch.fau.de (10.15.8.13) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 26 Jun 2019 09:35:48 +0200 Received: from TroubleWorld.fritz.box (95.90.221.207) by MBX3.exch.uni-erlangen.de (10.15.8.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1591.10; Wed, 26 Jun 2019 09:35:48 +0200 From: Fabian Krueger CC: , Michael Scheiderer , , Greg Kroah-Hartman , , Subject: [PATCH 4/8] staging: kpc2000: remove unnecessary brackets Date: Wed, 26 Jun 2019 09:35:22 +0200 Message-ID: <20190626073531.8946-5-fabian.krueger@fau.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190626073531.8946-1-fabian.krueger@fau.de> References: <20190625115251.GA28859@kadam> <20190626073531.8946-1-fabian.krueger@fau.de> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [95.90.221.207] X-ClientProxiedBy: MBX3.exch.uni-erlangen.de (10.15.8.45) To MBX3.exch.uni-erlangen.de (10.15.8.45) To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Removed brackets on around one-lined if-cases. This refactoring makes the code more readable. Signed-off-by: Fabian Krueger Signed-off-by: Michael Scheiderer Cc: --- drivers/staging/kpc2000/kpc2000_spi.c | 30 +++++++++------------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/staging/kpc2000/kpc2000_spi.c b/drivers/staging/kpc2000/kpc2000_spi.c index 42d32de2230e..b4dba0e42c72 100644 --- a/drivers/staging/kpc2000/kpc2000_spi.c +++ b/drivers/staging/kpc2000/kpc2000_spi.c @@ -165,9 +165,8 @@ kp_spi_read_reg(struct kp_spi_controller_state *cs, int idx) u64 val; addr += idx; - if ((idx == KP_SPI_REG_CONFIG) && (cs->conf_cache >= 0)){ + if ((idx == KP_SPI_REG_CONFIG) && (cs->conf_cache >= 0)) return cs->conf_cache; - } val = readq(addr); return val; } @@ -192,11 +191,10 @@ kp_spi_wait_for_reg_bit(struct kp_spi_controller_state *cs, int idx, timeout = jiffies + msecs_to_jiffies(1000); while (!(kp_spi_read_reg(cs, idx) & bit)) { if (time_after(jiffies, timeout)) { - if (!(kp_spi_read_reg(cs, idx) & bit)) { + if (!(kp_spi_read_reg(cs, idx) & bit)) return -ETIMEDOUT; - } else { + else return 0; - } } cpu_relax(); } @@ -305,9 +303,8 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m) cs = spidev->controller_state; /* reject invalid messages and transfers */ - if (list_empty(&m->transfers)) { + if (list_empty(&m->transfers)) return -EINVAL; - } /* validate input */ list_for_each_entry(transfer, &m->transfers, transfer_list) { @@ -365,17 +362,14 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m) sc.reg = kp_spi_read_reg(cs, KP_SPI_REG_CONFIG); /* ...direction */ - if (transfer->tx_buf) { + if (transfer->tx_buf) sc.bitfield.trm = KP_SPI_REG_CONFIG_TRM_TX; - } - else if (transfer->rx_buf) { + else if (transfer->rx_buf) sc.bitfield.trm = KP_SPI_REG_CONFIG_TRM_RX; - } /* ...word length */ - if (transfer->bits_per_word) { + if (transfer->bits_per_word) word_len = transfer->bits_per_word; - } sc.bitfield.wl = word_len-1; /* ...chip select */ @@ -394,9 +388,8 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m) } } - if (transfer->delay_usecs) { + if (transfer->delay_usecs) udelay(transfer->delay_usecs); - } } /* de-assert chip select to end the sequence */ @@ -419,9 +412,7 @@ kp_spi_cleanup(struct spi_device *spidev) { struct kp_spi_controller_state *cs = spidev->controller_state; - if (cs) { - kfree(cs); - } + kfree(cs); } /****************** @@ -463,9 +454,8 @@ kp_spi_probe(struct platform_device *pldev) kpspi->dev = &pldev->dev; master->num_chipselect = 4; - if (pldev->id != -1) { + if (pldev->id != -1) master->bus_num = pldev->id; - } r = platform_get_resource(pldev, IORESOURCE_MEM, 0); if (r == NULL) { -- 2.17.1