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=-9.8 required=3.0 tests=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 6F04AC00454 for ; Tue, 10 Dec 2019 11:44:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A55F2073D for ; Tue, 10 Dec 2019 11:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727594AbfLJLoL (ORCPT ); Tue, 10 Dec 2019 06:44:11 -0500 Received: from faui03.informatik.uni-erlangen.de ([131.188.30.103]:38948 "EHLO faui03.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726957AbfLJLoI (ORCPT ); Tue, 10 Dec 2019 06:44:08 -0500 Received: from faui04g.informatik.uni-erlangen.de (faui04g.informatik.uni-erlangen.de [131.188.30.137]) by faui03.informatik.uni-erlangen.de (Postfix) with ESMTP id 5F1CC241838; Tue, 10 Dec 2019 12:44:07 +0100 (CET) Received: by faui04g.informatik.uni-erlangen.de (Postfix, from userid 66991) id 53934843353; Tue, 10 Dec 2019 12:44:07 +0100 (CET) From: Simon Geis To: Dominik Brodowski Cc: Simon Geis , Greg Kroah-Hartman , Thomas Gleixner , Colin Ian King , Adam Zerella , linux-kernel@vger.kernel.org, linux-kernel@i4.cs.fau.de, Lukas Panzer Subject: [PATCH v2 03/10] PCMCIA/i82092: remove braces around single statement blocks Date: Tue, 10 Dec 2019 12:43:28 +0100 Message-Id: <20191210114333.12239-4-simon.geis@fau.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210114333.12239-1-simon.geis@fau.de> References: <20191210114333.12239-1-simon.geis@fau.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove braces around single statement blocks in order to maintain the Linux kernel coding style. Co-developed-by: Lukas Panzer Signed-off-by: Lukas Panzer Signed-off-by: Simon Geis --- drivers/pcmcia/i82092.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c index 2f698d021411..0adac6b24915 100644 --- a/drivers/pcmcia/i82092.c +++ b/drivers/pcmcia/i82092.c @@ -145,9 +145,8 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i sockets[i].socket.ops = &i82092aa_operations; sockets[i].socket.resource_ops = &pccard_nonstatic_ops; ret = pcmcia_register_socket(&sockets[i].socket); - if (ret) { + if (ret) goto err_out_free_sockets; - } } leave("i82092aa_pci_probe"); @@ -155,9 +154,8 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i err_out_free_sockets: if (i) { - for (i--; i >= 0; i--) { + for (i--; i >= 0; i--) pcmcia_unregister_socket(&sockets[i].socket); - } } free_irq(dev->irq, i82092aa_interrupt); err_out_free_res: @@ -346,9 +344,8 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev) events |= (csc & I365_CSC_READY) ? SS_READY : 0; } - if (events) { + if (events) pcmcia_parse_events(&sockets[i].socket, events); - } active |= events; } @@ -430,9 +427,8 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value) status = indirect_read(sock, I365_STATUS); /* Interface Status Register */ *value = 0; - if ((status & I365_CS_DETECT) == I365_CS_DETECT) { + if ((status & I365_CS_DETECT) == I365_CS_DETECT) *value |= SS_DETECT; - } /* IO cards have a different meaning of bits 0,1 */ /* Also notice the inverse-logic on the bits */ @@ -545,9 +541,8 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *sta /* Enable specific interrupt events */ reg = 0x00; - if (state->csc_mask & SS_DETECT) { + if (state->csc_mask & SS_DETECT) reg |= I365_CSC_DETECT; - } if (state->flags & SS_IOCARD) { if (state->csc_mask & SS_STSCHG) reg |= I365_CSC_STSCHG; -- 2.20.1