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,
Richard Henderson <richard.henderson@linaro.org>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Matt Turner <mattst88@gmail.com>,
linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: 3chas3@gmail.com, brking@us.ibm.com, dalias@libc.org,
glaubitz@physik.fu-berlin.de, jejb@linux.ibm.com, kw@linux.com,
linux-arm-kernel@lists.infradead.org,
linux-atm-general@lists.sourceforge.net,
linux-scsi@vger.kernel.org, linux-sh@vger.kernel.org,
lpieralisi@kernel.org, martin.petersen@oracle.com,
netdev@vger.kernel.org, toan@os.amperecomputing.com,
ysato@users.sourceforge.jp,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v3 1/6] alpha: Streamline convoluted PCI error handling
Date: Mon, 11 Sep 2023 15:53:49 +0300 [thread overview]
Message-ID: <20230911125354.25501-2-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230911125354.25501-1-ilpo.jarvinen@linux.intel.com>
miata_map_irq() handles PCI device and read config related errors in a
conditional block that is more complex than necessary.
Streamline the code flow and error handling.
No functional changes intended.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
arch/alpha/kernel/sys_miata.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/arch/alpha/kernel/sys_miata.c b/arch/alpha/kernel/sys_miata.c
index e1bee8f84c58..33b2798de8fc 100644
--- a/arch/alpha/kernel/sys_miata.c
+++ b/arch/alpha/kernel/sys_miata.c
@@ -183,16 +183,17 @@ miata_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
the 2nd 8259 controller. So we have to check for it first. */
if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) {
- u8 irq=0;
struct pci_dev *pdev = pci_get_slot(dev->bus, dev->devfn & ~7);
- if(pdev == NULL || pci_read_config_byte(pdev, 0x40,&irq) != PCIBIOS_SUCCESSFUL) {
- pci_dev_put(pdev);
+ u8 irq = 0;
+ int ret;
+
+ if (!pdev)
return -1;
- }
- else {
- pci_dev_put(pdev);
- return irq;
- }
+
+ ret = pci_read_config_byte(pdev, 0x40, &irq);
+ pci_dev_put(pdev);
+
+ return ret == PCIBIOS_SUCCESSFUL ? irq : -1;
}
return COMMON_TABLE_LOOKUP;
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev 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 ` Ilpo Järvinen [this message]
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 ` [PATCH v3 5/6] PCI: xgene: Do PCI error check on own line & keep return value Ilpo Järvinen
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-2-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=3chas3@gmail.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;
as well as URLs for NNTP newsgroup(s).