public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: "Rob Herring" <robh@kernel.org>,
	"Bjorn Helgaas" <helgaas@kernel.org>,
	linux-pci@vger.kernel.org,
	"Toan Le" <toan@os.amperecomputing.com>,
	"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
	"Krzysztof Wilczyński" <kw@linux.com>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Cc: 3chas3@gmail.com, brking@us.ibm.com, dalias@libc.org,
	glaubitz@physik.fu-berlin.de, ink@jurassic.park.msu.ru,
	jejb@linux.ibm.com, linux-alpha@vger.kernel.org,
	linux-atm-general@lists.sourceforge.net,
	linux-scsi@vger.kernel.org, linux-sh@vger.kernel.org,
	martin.petersen@oracle.com, mattst88@gmail.com,
	netdev@vger.kernel.org, richard.henderson@linaro.org,
	ysato@users.sourceforge.jp,
	"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v3 5/6] PCI: xgene: Do PCI error check on own line & keep return value
Date: Mon, 11 Sep 2023 15:53:53 +0300	[thread overview]
Message-ID: <20230911125354.25501-6-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230911125354.25501-1-ilpo.jarvinen@linux.intel.com>

Instead of a if condition with a line split, use the usual error
handling pattern with a separate variable to improve readability.

pci_generic_config_read32() already returns either PCIBIOS_SUCCESSFUL
or PCIBIOS_DEVICE_NOT_FOUND so it is enough to simply return its
return value when ret != PCIBIOS_SUCCESSFUL.

No functional changes intended.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
 drivers/pci/controller/pci-xgene.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index 887b4941ff32..8e457fa450a2 100644
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -163,10 +163,11 @@ static int xgene_pcie_config_read32(struct pci_bus *bus, unsigned int devfn,
 				    int where, int size, u32 *val)
 {
 	struct xgene_pcie *port = pcie_bus_to_port(bus);
+	int ret;
 
-	if (pci_generic_config_read32(bus, devfn, where & ~0x3, 4, val) !=
-	    PCIBIOS_SUCCESSFUL)
-		return PCIBIOS_DEVICE_NOT_FOUND;
+	ret = pci_generic_config_read32(bus, devfn, where & ~0x3, 4, val);
+	if (ret != PCIBIOS_SUCCESSFUL)
+		return ret;
 
 	/*
 	 * The v1 controller has a bug in its Configuration Request Retry
-- 
2.30.2


  parent reply	other threads:[~2023-09-11 12:54 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-11 12:53 [PATCH v3 0/6] PCI/treewide: Cleanup/streamline PCI error code handling Ilpo Järvinen
2023-09-11 12:53 ` [PATCH v3 1/6] alpha: Streamline convoluted PCI error handling Ilpo Järvinen
2023-09-11 12:53 ` [PATCH v3 2/6] sh: pci: Do PCI error check on own line Ilpo Järvinen
2023-09-11 12:53 ` [PATCH v3 3/6] atm: iphase: Do PCI error checks " Ilpo Järvinen
2023-09-11 12:53 ` [PATCH v3 4/6] PCI: Do error check on own line to split long if conditions Ilpo Järvinen
2023-09-11 12:53 ` Ilpo Järvinen [this message]
2023-09-11 12:53 ` [PATCH v3 6/6] scsi: ipr: Do PCI error checks on own line Ilpo Järvinen
2023-09-14  1:00   ` Martin K. Petersen
2023-10-10 22:35 ` [PATCH v3 0/6] PCI/treewide: Cleanup/streamline PCI error code handling Bjorn Helgaas
2023-10-11 11:07   ` 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=20230911125354.25501-6-ilpo.jarvinen@linux.intel.com \
    --to=ilpo.jarvinen@linux.intel.com \
    --cc=3chas3@gmail.com \
    --cc=bhelgaas@google.com \
    --cc=brking@us.ibm.com \
    --cc=dalias@libc.org \
    --cc=glaubitz@physik.fu-berlin.de \
    --cc=helgaas@kernel.org \
    --cc=ink@jurassic.park.msu.ru \
    --cc=jejb@linux.ibm.com \
    --cc=kw@linux.com \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-atm-general@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=lpieralisi@kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=mattst88@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=richard.henderson@linaro.org \
    --cc=robh@kernel.org \
    --cc=toan@os.amperecomputing.com \
    --cc=ysato@users.sourceforge.jp \
    /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