From: Simon Geis <simon.geis@fau.de>
To: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Simon Geis <simon.geis@fau.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Colin Ian King <colin.king@canonical.com>,
Adam Zerella <adam.zerella@gmail.com>,
linux-kernel@vger.kernel.org, linux-kernel@i4.cs.fau.de,
Lukas Panzer <lukas.panzer@fau.de>
Subject: [PATCH 05/12] PCMCIA: remove braces around single statement blocks
Date: Sun, 8 Dec 2019 17:09:40 +0100 [thread overview]
Message-ID: <20191208160947.20694-6-simon.geis@fau.de> (raw)
In-Reply-To: <20191208160947.20694-2-simon.geis@fau.de>
Co-developed-by: Lukas Panzer <lukas.panzer@fau.de>
Signed-off-by: Lukas Panzer <lukas.panzer@fau.de>
Signed-off-by: Simon Geis <simon.geis@fau.de>
---
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
next prev parent reply other threads:[~2019-12-08 16:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-08 16:09 [PATCH 01/12] PCMCIA: use dev_err/dev_info instead of printk Simon Geis
2019-12-08 16:09 ` [PATCH 02/12] PCMCIA: remove trailing whitespaces Simon Geis
2019-12-08 16:09 ` [PATCH 03/12] PCMCIA: add/remove wrong spaces Simon Geis
2019-12-08 16:09 ` [PATCH 04/12] PCMCIA: Remove spaces before tabs Simon Geis
2019-12-08 16:09 ` Simon Geis [this message]
2019-12-08 16:09 ` [PATCH 06/12] PCMCIA: insert blank line after declarations Simon Geis
2019-12-08 16:09 ` [PATCH 07/12] PCMCIA: change incorrect code indentation Simon Geis
2019-12-08 16:09 ` [PATCH 08/12] PCMCIA: move assignment out of if condition Simon Geis
2019-12-08 16:09 ` [PATCH 09/12] PCMCIA: shorten the lines with over 80 characters Simon Geis
2019-12-08 20:52 ` Dominik Brodowski
2019-12-08 16:09 ` [PATCH 10/12] PCMCIA: include <linux/io.h> instead of <asm/io.h> Simon Geis
2019-12-08 20:54 ` Dominik Brodowski
2019-12-08 16:09 ` [PATCH 11/12] PCMCIA: use dev_dbg instead of enter/leave Simon Geis
2019-12-08 20:57 ` Dominik Brodowski
2019-12-08 16:09 ` [PATCH 12/12] PCMCIA: remove ifdef 0 block Simon Geis
2019-12-08 20:58 ` Dominik Brodowski
2019-12-08 20:41 ` [PATCH 01/12] PCMCIA: use dev_err/dev_info instead of printk Dominik Brodowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191208160947.20694-6-simon.geis@fau.de \
--to=simon.geis@fau.de \
--cc=adam.zerella@gmail.com \
--cc=colin.king@canonical.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@i4.cs.fau.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=lukas.panzer@fau.de \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®