Commit 87576090 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

scsi: ipr: Do PCI error checks on own line 

Instead of "if" conditions with line splits, use the usual error handling
pattern with a separate variable to improve readability.

No functional changes intended.

Link: https://lore.kernel.org/r/20230911125354.25501-7-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatar"Martin K. Petersen" <martin.petersen@oracle.com>
parent 910ed628

drivers/scsi/ipr.c

+8 −4
Original line number Diff line number Diff line
@@ -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;

		}