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, Don Brace <don.brace@microsemi.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
esc.storagedev@microsemi.com, linux-scsi@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 5/8] scsi: smartpqi: Convert PCIBIOS_* errors to generic -E* errors
Date: Mon, 15 Jun 2020 09:32:22 +0200 [thread overview]
Message-ID: <20200615073225.24061-6-refactormyself@gmail.com> (raw)
In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com>
From: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
pqi_set_pcie_completion_timeout() return PCIBIOS_ error codes which were
passed on down the call heirarchy 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 the return value of PCIe capability accessors, call
pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to
negative generic error values.
Suggested-by: Bjorn Helgaas <bjorn@helgaas.com>
Signed-off-by: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
---
drivers/scsi/smartpqi/smartpqi_init.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index cd157f11eb22..bd38c8cea56e 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -7423,8 +7423,12 @@ static int pqi_ctrl_init_resume(struct pqi_ctrl_info *ctrl_info)
static inline int pqi_set_pcie_completion_timeout(struct pci_dev *pci_dev,
u16 timeout)
{
- return pcie_capability_clear_and_set_word(pci_dev, PCI_EXP_DEVCTL2,
+ int rc;
+
+ rc = pcie_capability_clear_and_set_word(pci_dev, PCI_EXP_DEVCTL2,
PCI_EXP_DEVCTL2_COMP_TIMEOUT, timeout);
+
+ return pcibios_err_to_errno(rc);
}
static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
--
2.18.2
WARNING: multiple messages have this Message-ID (diff)
From: refactormyself@gmail.com
To: helgaas@kernel.org
Cc: Don Brace <don.brace@microsemi.com>,
linux-scsi@vger.kernel.org,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Bolarinwa Olayemi Saheed <refactormyself@gmail.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org,
esc.storagedev@microsemi.com
Subject: [Linux-kernel-mentees] [PATCH v2 5/8] scsi: smartpqi: Convert PCIBIOS_* errors to generic -E* errors
Date: Mon, 15 Jun 2020 09:32:22 +0200 [thread overview]
Message-ID: <20200615073225.24061-6-refactormyself@gmail.com> (raw)
In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com>
From: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
pqi_set_pcie_completion_timeout() return PCIBIOS_ error codes which were
passed on down the call heirarchy 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 the return value of PCIe capability accessors, call
pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to
negative generic error values.
Suggested-by: Bjorn Helgaas <bjorn@helgaas.com>
Signed-off-by: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
---
drivers/scsi/smartpqi/smartpqi_init.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index cd157f11eb22..bd38c8cea56e 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -7423,8 +7423,12 @@ static int pqi_ctrl_init_resume(struct pqi_ctrl_info *ctrl_info)
static inline int pqi_set_pcie_completion_timeout(struct pci_dev *pci_dev,
u16 timeout)
{
- return pcie_capability_clear_and_set_word(pci_dev, PCI_EXP_DEVCTL2,
+ int rc;
+
+ rc = pcie_capability_clear_and_set_word(pci_dev, PCI_EXP_DEVCTL2,
PCI_EXP_DEVCTL2_COMP_TIMEOUT, timeout);
+
+ return pcibios_err_to_errno(rc);
}
static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
--
2.18.2
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next prev parent reply other threads:[~2020-06-15 8:32 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 7:32 [PATCH 0/8 v2] PCI: Align return values of PCIe capability and PCI accessors refactormyself
2020-06-15 7:32 ` [Linux-kernel-mentees] " refactormyself
2020-06-15 7:32 ` refactormyself
2020-06-15 7:32 ` [PATCH v2 1/8] dmaengine: ioatdma: Convert PCIBIOS_* errors to generic -E* errors refactormyself
2020-06-15 7:32 ` [Linux-kernel-mentees] " refactormyself
2020-06-15 7:32 ` [PATCH v2 2/8] IB/hfi1: " refactormyself
2020-06-15 7:32 ` [Linux-kernel-mentees] " refactormyself
2020-06-29 20:09 ` Dennis Dalessandro
2020-06-29 20:09 ` [Linux-kernel-mentees] " Dennis Dalessandro
2020-06-15 7:32 ` [PATCH v2 3/8] " refactormyself
2020-06-15 7:32 ` [Linux-kernel-mentees] " refactormyself
2020-06-29 20:22 ` Dennis Dalessandro
2020-06-29 20:22 ` [Linux-kernel-mentees] " Dennis Dalessandro
2020-06-15 7:32 ` [PATCH v2 4/8] PCI: " refactormyself
2020-06-15 7:32 ` [Linux-kernel-mentees] " refactormyself
2020-06-15 7:32 ` refactormyself [this message]
2020-06-15 7:32 ` [Linux-kernel-mentees] [PATCH v2 5/8] scsi: smartpqi: " refactormyself
2020-06-15 7:32 ` [PATCH v2 6/8] PCI/AER: " refactormyself
2020-06-15 7:32 ` [Linux-kernel-mentees] " refactormyself
2020-06-15 7:32 ` refactormyself
2020-06-15 7:32 ` [PATCH v2 7/8] " refactormyself
2020-06-15 7:32 ` [Linux-kernel-mentees] " refactormyself
2020-06-15 7:32 ` refactormyself
2020-06-15 7:32 ` [PATCH v2 8/8] PCI: Align return values of PCIe capability and PCI accessors refactormyself
2020-06-15 7:32 ` [Linux-kernel-mentees] " refactormyself
2020-06-15 13:46 ` [PATCH 0/8 v2] " Jason Gunthorpe
2020-06-15 13:46 ` [Linux-kernel-mentees] " Jason Gunthorpe
2020-06-15 13:46 ` Jason Gunthorpe
2020-06-26 18:52 ` Bjorn Helgaas
2020-06-26 18:52 ` [Linux-kernel-mentees] " Bjorn Helgaas
2020-06-26 18:52 ` Bjorn Helgaas
2020-06-30 16:24 ` Jason Gunthorpe
2020-06-30 16:24 ` [Linux-kernel-mentees] " Jason Gunthorpe
2020-06-30 16:24 ` Jason Gunthorpe
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=20200615073225.24061-6-refactormyself@gmail.com \
--to=refactormyself@gmail.com \
--cc=bjorn@helgaas.com \
--cc=don.brace@microsemi.com \
--cc=esc.storagedev@microsemi.com \
--cc=helgaas@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.