linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: refactormyself@gmail.com
To: helgaas@kernel.org
Cc: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>,
	bjorn@helgaas.com, linux-pci@vger.kernel.org,
	skhan@linuxfoundation.org
Subject: [PATCH 3/8] PCI: Convert PCIBIOS_ error codes to non-PCI generic error codes
Date: Tue,  9 Jun 2020 17:39:45 +0200	[thread overview]
Message-ID: <20200609153950.8346-4-refactormyself@gmail.com> (raw)
In-Reply-To: <20200609153950.8346-1-refactormyself@gmail.com>

From: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>

restore_pci_variables() and save_pci_variables() return PCIBIOS_ error
codes from pcie capability accessors.

PCIBIOS_ error codes have positive values. Passing on these values is
inconsistent with functions which return only a negative value on failure.

Before passing on return value of pcie capability accessors, call
pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to
negative non-PCI generic error values.

Signed-off-by: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
Suggested-by: Bjorn Helgaas <bjorn@helgaas.com>
---
 drivers/infiniband/hw/hfi1/pcie.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c
index eb53781d0c6a..eb2790e9db36 100644
--- a/drivers/infiniband/hw/hfi1/pcie.c
+++ b/drivers/infiniband/hw/hfi1/pcie.c
@@ -334,7 +334,11 @@ int pcie_speeds(struct hfi1_devdata *dd)
 	return 0;
 }
 
-/* restore command and BARs after a reset has wiped them out */
+/**
+ * restore command and BARs after a reset has wiped them out
+ *
+ * Returns 0 on success, otherwise a negative error value
+ */
 int restore_pci_variables(struct hfi1_devdata *dd)
 {
 	int ret = 0;
@@ -386,10 +390,14 @@ int restore_pci_variables(struct hfi1_devdata *dd)
 
 error:
 	dd_dev_err(dd, "Unable to write to PCI config\n");
-	return ret;
+	return pcibios_err_to_errno(ret);
 }
 
-/* Save BARs and command to rewrite after device reset */
+/**
+ * Save BARs and command to rewrite after device reset
+ *
+ * Returns 0 on success, otherwise a negative error value
+ */
 int save_pci_variables(struct hfi1_devdata *dd)
 {
 	int ret = 0;
@@ -441,7 +449,7 @@ int save_pci_variables(struct hfi1_devdata *dd)
 
 error:
 	dd_dev_err(dd, "Unable to read from PCI config\n");
-	return ret;
+	return pcibios_err_to_errno(ret);
 }
 
 /*
-- 
2.18.2


  parent reply	other threads:[~2020-06-09 16:39 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-09 15:39 [PATCH 0/8] PCI: Align return value of pcie capability accessors with other accessors refactormyself
2020-06-09 15:39 ` [PATCH 1/8] PCI: Convert PCIBIOS_ error codes to non-PCI generic error codes refactormyself
2020-06-09 15:39 ` [PATCH 2/8] " refactormyself
2020-06-09 15:39 ` refactormyself [this message]
2020-06-11 22:24   ` [PATCH 3/8] " Bjorn Helgaas
2020-06-09 15:39 ` [PATCH 4/8] " refactormyself
2020-06-09 15:39 ` [PATCH 5/8] " refactormyself
2020-06-09 15:39 ` [PATCH 6/8] " refactormyself
2020-06-11 22:26   ` Bjorn Helgaas
2020-06-09 15:39 ` [PATCH 7/8] " refactormyself
2020-06-11 22:27   ` Bjorn Helgaas
2020-06-09 15:39 ` [PATCH 8/8] PCI: Align return value of pcie capability accessors with other accessors refactormyself
2020-06-11 22:28   ` Bjorn Helgaas
2020-06-11 22:16 ` [PATCH 0/8] " Bjorn Helgaas

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=20200609153950.8346-4-refactormyself@gmail.com \
    --to=refactormyself@gmail.com \
    --cc=bjorn@helgaas.com \
    --cc=helgaas@kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=skhan@linuxfoundation.org \
    /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).