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 v3 04/10] PCMCIA/i82092: insert blank line after declarations
Date: Fri, 13 Dec 2019 14:53:08 +0100 [thread overview]
Message-ID: <20191213135311.9111-5-simon.geis@fau.de> (raw)
In-Reply-To: <20191213135311.9111-1-simon.geis@fau.de>
Improve readability of the code by inserting a blank line
after variable declarations.
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 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index b957e095bbb6..16431b48fd9e 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -187,6 +187,7 @@ static unsigned char indirect_read(int socket, unsigned short reg)
unsigned short int port;
unsigned char val;
unsigned long flags;
+
spin_lock_irqsave(&port_lock, flags);
reg += socket * 0x40;
port = sockets[socket].io_base;
@@ -202,6 +203,7 @@ static unsigned short indirect_read16(int socket, unsigned short reg)
unsigned short int port;
unsigned short tmp;
unsigned long flags;
+
spin_lock_irqsave(&port_lock, flags);
reg = reg + socket * 0x40;
port = sockets[socket].io_base;
@@ -219,6 +221,7 @@ static void indirect_write(int socket, unsigned short reg, unsigned char value)
{
unsigned short int port;
unsigned long flags;
+
spin_lock_irqsave(&port_lock, flags);
reg = reg + socket * 0x40;
port = sockets[socket].io_base;
@@ -232,6 +235,7 @@ static void indirect_setbit(int socket, unsigned short reg, unsigned char mask)
unsigned short int port;
unsigned char val;
unsigned long flags;
+
spin_lock_irqsave(&port_lock, flags);
reg = reg + socket * 0x40;
port = sockets[socket].io_base;
@@ -249,6 +253,7 @@ static void indirect_resetbit(int socket, unsigned short reg, unsigned char mask
unsigned short int port;
unsigned char val;
unsigned long flags;
+
spin_lock_irqsave(&port_lock, flags);
reg = reg + socket * 0x40;
port = sockets[socket].io_base;
@@ -265,6 +270,7 @@ static void indirect_write16(int socket, unsigned short reg, unsigned short valu
unsigned short int port;
unsigned char val;
unsigned long flags;
+
spin_lock_irqsave(&port_lock, flags);
reg = reg + socket * 0x40;
port = sockets[socket].io_base;
@@ -317,6 +323,7 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)
for (i = 0; i < socket_count; i++) {
int csc;
+
if (sockets[i].card_state == 0) /* Inactive socket, should not happen */
continue;
@@ -362,6 +369,7 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)
static int card_present(int socketno)
{
unsigned int val;
+
enter("card_present");
if ((socketno < 0) || (socketno >= MAX_SOCKETS))
--
2.20.1
next prev parent reply other threads:[~2019-12-13 20:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 13:53 [PATCH v3 00/10] PCMCIA/i82092: Fix style issues in i82092.c Simon Geis
2019-12-13 13:53 ` [PATCH v3 01/10] PCMCIA/i82092: use dev_<level> instead of printk Simon Geis
2019-12-16 10:18 ` Dominik Brodowski
2019-12-13 13:53 ` [PATCH v3 02/10] PCMCIA/i82092: add/remove spaces to improve readability Simon Geis
2019-12-16 10:25 ` Dominik Brodowski
2019-12-13 13:53 ` [PATCH v3 03/10] PCMCIA/i82092: remove braces around single statement blocks Simon Geis
2019-12-16 10:29 ` Dominik Brodowski
2019-12-13 13:53 ` Simon Geis [this message]
2019-12-16 10:30 ` [PATCH v3 04/10] PCMCIA/i82092: insert blank line after declarations Dominik Brodowski
2019-12-13 13:53 ` [PATCH v3 05/10] PCMCIA/i82092: change code indentation Simon Geis
2019-12-16 10:31 ` Dominik Brodowski
2019-12-13 13:53 ` [PATCH v3 06/10] PCMCIA/i82092: move assignment out of if condition Simon Geis
2019-12-16 10:32 ` Dominik Brodowski
2019-12-13 13:53 ` [PATCH v3 07/10] PCMCIA/i82092: shorten the lines with over 80 characters Simon Geis
2019-12-16 10:35 ` Dominik Brodowski
2019-12-13 13:53 ` [PATCH v3 08/10] PCMCIA/i82092: include <linux/io.h> instead of <asm/io.h> Simon Geis
2019-12-16 10:35 ` Dominik Brodowski
2019-12-13 13:53 ` [PATCH v3 09/10] PCMCIA/i82092: delete enter/leave macro Simon Geis
2019-12-16 10:38 ` Dominik Brodowski
2019-12-13 13:53 ` [PATCH v3 10/10] PCMCIA/i82092: remove #if 0 block Simon Geis
2019-12-16 10:39 ` Dominik Brodowski
2019-12-16 10:58 ` [PATCH v3 00/10] PCMCIA/i82092: Fix style issues in i82092.c 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=20191213135311.9111-5-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;
as well as URLs for NNTP newsgroup(s).