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 06/10] PCMCIA/i82092: move assignment out of if condition
Date: Fri, 13 Dec 2019 14:53:10 +0100 [thread overview]
Message-ID: <20191213135311.9111-7-simon.geis@fau.de> (raw)
In-Reply-To: <20191213135311.9111-1-simon.geis@fau.de>
Improve readability by moving the assignment out of if conditions.
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 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 6b39750db282..ad105f9949c7 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -77,7 +77,8 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i
enter("i82092aa_pci_probe");
- if ((ret = pci_enable_device(dev)))
+ ret = pci_enable_device(dev);
+ if (ret)
return ret;
pci_read_config_byte(dev, 0x40, &configbyte); /* PCI Configuration Control */
@@ -133,7 +134,9 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i
/* Register the interrupt handler */
dev_dbg(&dev->dev, "Requesting interrupt %i\n", dev->irq);
- if ((ret = request_irq(dev->irq, i82092aa_interrupt, IRQF_SHARED, "i82092aa", i82092aa_interrupt))) {
+ ret = request_irq(dev->irq, i82092aa_interrupt, IRQF_SHARED,
+ "i82092aa", i82092aa_interrupt);
+ if (ret) {
dev_err(&dev->dev, "Failed to register IRQ %d, aborting\n",
dev->irq);
goto err_out_free_res;
--
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 ` [PATCH v3 04/10] PCMCIA/i82092: insert blank line after declarations Simon Geis
2019-12-16 10:30 ` 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 ` Simon Geis [this message]
2019-12-16 10:32 ` [PATCH v3 06/10] PCMCIA/i82092: move assignment out of if condition 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-7-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).