From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-pci@vger.kernel.org, Bjorn Helgaas <helgaas@kernel.org>,
Brian King <brking@us.ibm.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH 12/14] scsi: ipr: Do PCI error checks on own line
Date: Thu, 24 Aug 2023 16:28:30 +0300 [thread overview]
Message-ID: <20230824132832.78705-13-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230824132832.78705-1-ilpo.jarvinen@linux.intel.com>
Instead of if conditions with line splits, use the usual error handling
pattern with a separate variable to improve readability.
No functional changes intended.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
drivers/scsi/ipr.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 4e13797b2a4a..81e3d464d1f6 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -761,12 +761,14 @@ static void ipr_mask_and_clear_interrupts(struct ipr_ioa_cfg *ioa_cfg,
static int ipr_save_pcix_cmd_reg(struct ipr_ioa_cfg *ioa_cfg)
{
int pcix_cmd_reg = pci_find_capability(ioa_cfg->pdev, PCI_CAP_ID_PCIX);
+ int rc;
if (pcix_cmd_reg == 0)
return 0;
- if (pci_read_config_word(ioa_cfg->pdev, pcix_cmd_reg + PCI_X_CMD,
- &ioa_cfg->saved_pcix_cmd_reg) != PCIBIOS_SUCCESSFUL) {
+ rc = pci_read_config_word(ioa_cfg->pdev, pcix_cmd_reg + PCI_X_CMD,
+ &ioa_cfg->saved_pcix_cmd_reg);
+ if (rc != PCIBIOS_SUCCESSFUL) {
dev_err(&ioa_cfg->pdev->dev, "Failed to save PCI-X command register\n");
return -EIO;
}
@@ -785,10 +787,12 @@ static int ipr_save_pcix_cmd_reg(struct ipr_ioa_cfg *ioa_cfg)
static int ipr_set_pcix_cmd_reg(struct ipr_ioa_cfg *ioa_cfg)
{
int pcix_cmd_reg = pci_find_capability(ioa_cfg->pdev, PCI_CAP_ID_PCIX);
+ int rc;
if (pcix_cmd_reg) {
- if (pci_write_config_word(ioa_cfg->pdev, pcix_cmd_reg + PCI_X_CMD,
- ioa_cfg->saved_pcix_cmd_reg) != PCIBIOS_SUCCESSFUL) {
+ rc = pci_write_config_word(ioa_cfg->pdev, pcix_cmd_reg + PCI_X_CMD,
+ ioa_cfg->saved_pcix_cmd_reg);
+ if (rc != PCIBIOS_SUCCESSFUL) {
dev_err(&ioa_cfg->pdev->dev, "Failed to setup PCI-X command register\n");
return -EIO;
}
--
2.30.2
next prev parent reply other threads:[~2023-08-24 13:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 13:28 [PATCH 00/14] PCI/treewide: Cleanup/streamline PCI error code handling Ilpo Järvinen
2023-08-24 13:28 ` [PATCH 01/14] alpha: Streamline convoluted PCI error handling Ilpo Järvinen
2023-08-24 13:28 ` [PATCH 02/14] MIPS: TXx9: Do PCI error checks on own line Ilpo Järvinen
2023-08-24 15:20 ` Philippe Mathieu-Daudé
2023-08-24 13:28 ` [PATCH 03/14] sh: pci: Do PCI error check " Ilpo Järvinen
2023-08-24 13:44 ` John Paul Adrian Glaubitz
2023-08-24 13:28 ` [PATCH 04/14] atm: iphase: Do PCI error checks " Ilpo Järvinen
2023-08-24 13:28 ` [PATCH 05/14] hwmon: (via686a) " Ilpo Järvinen
2023-08-25 13:18 ` Guenter Roeck
2023-08-24 13:28 ` [PATCH 06/14] hwmon: (vt8231) " Ilpo Järvinen
2023-08-25 13:19 ` Guenter Roeck
2023-08-24 13:28 ` [PATCH 07/14] I2C: ali15x3: " Ilpo Järvinen
2023-08-24 16:00 ` Andi Shyti
2023-08-25 8:34 ` Ilpo Järvinen
2023-08-24 13:28 ` [PATCH 08/14] I2C: nforce2: Do PCI error check " Ilpo Järvinen
2023-08-24 16:02 ` Andi Shyti
2023-09-01 11:12 ` Jean Delvare
2023-08-24 13:28 ` [PATCH 09/14] I2C: sis5595: Do PCI error checks " Ilpo Järvinen
2023-08-24 16:04 ` Andi Shyti
2023-09-01 11:16 ` Jean Delvare
2023-08-24 13:28 ` [PATCH 10/14] PCI: Do error check on own line to split long if conditions Ilpo Järvinen
2023-08-24 13:28 ` [PATCH 11/14] PCI: xgene: Do PCI error check on own line Ilpo Järvinen
2023-08-24 13:28 ` Ilpo Järvinen [this message]
2023-08-24 13:28 ` [PATCH 13/14] hwmon: (sis5595) Do PCI error checks " Ilpo Järvinen
2023-08-25 13:21 ` Guenter Roeck
2023-08-24 13:28 ` [PATCH 14/14] perf/x86/uncore: Remove unnecessary ?: operator around pcibios_err_to_errno() call Ilpo Järvinen
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=20230824132832.78705-13-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=brking@us.ibm.com \
--cc=helgaas@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/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).