Wherever you're working in the tree, pay attention to the existing
style of code, comments, and commit logs and make yours match. For
example,
$ git log --oneline drivers/pci/access.c
af65d1ad416b PCI/AER: Save AER Capability for suspend/resume
984998e3404e PCI: Make pcie_downstream_port() available outside of access.c
5180fd913558 PCI: Uninline PCI bus accessors for better ftracing
df62ab5e0f75 PCI: Tidy comments
f0eb77ae6b85 PCI/VPD: Move VPD access code to vpd.c
ab8c609356fb Merge branch 'pci/spdx' into next
7328c8f48d18 PCI: Add SPDX GPL-2.0 when no license was specified
7506dc798993 PCI: Add wrappers for dev_printk()
So your subject needs to be something like:
PCI: Make return value of pcie_capability_*() consistent
On Mon, May 04, 2020 at 07:18:11AM +0200, refactormyself@xxxxxxxxx wrote:
> From: Bolarinwa Olayemi Saheed <refactormyself@xxxxxxxxx>
>
> pcie_capability_{read|write}_*() could return 0, -EINVAL, or any of the
> PCIBIOS_* error codes. This is behaviour is now changed to ONLY return a
> PCIBIOS_* error code or -ERANGE on error.
> This has now been made consistent across all accessors. Callers now have
> a consistent way for checking which error has occurred.
>
> An audit of the callers of these functions was made and no contradicting
> case was found in the examined call chains.
>
> Signed-off-by: Bolarinwa Olayemi Saheed <refactormyself@xxxxxxxxx>
> Suggested-by: Bjorn Helgaas <bjorn@xxxxxxxxxxx>
> ---
> drivers/pci/access.c | 64 +++++++++++++++++++++++++++++++++++---------
> 1 file changed, 51 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/pci/access.c b/drivers/pci/access.c
> index 79c4a2ef269a..10c771079e35 100644
> --- a/drivers/pci/access.c
> +++ b/drivers/pci/access.c
> @@ -402,6 +402,8 @@ static bool pcie_capability_reg_implemented(struct pci_dev *dev, int pos)
> * Note that these accessor functions are only for the "PCI Express
> * Capability" (see PCIe spec r3.0, sec 7.8). They do not apply to the
> * other "PCI Express Extended Capabilities" (AER, VC, ACS, MFVC, etc.)
> + *
> + * Return 0 on success, otherwise a negative value
Actually, a negative *error value*.
> int pcie_capability_read_word(struct pci_dev *dev, int pos, u16 *val)
> {
> @@ -409,7 +411,7 @@ int pcie_capability_read_word(struct pci_dev *dev, int pos, u16 *val)
>
> *val = 0;
> if (pos & 1)
> - return -EINVAL;
> + return PCIBIOS_BAD_REGISTER_NUMBER;
This does not match the commit log or the function comment. I know
the *next* patch will make it true, but the commit log and function
comment must describe the code at this point. Everything must be
consistent and buildable after every commit because future patches may
not ever be applied.
I think there's no reason to change these pcie_capability_*() return
values. I think the end state we want to get to would be to deprecate
the PCIBIOS_* #defines and use the -E* definitions instead.
> int pci_read_config_byte(const struct pci_dev *dev, int where, u8 *val)
> {
> + int ret;
> if (pci_dev_is_disconnected(dev)) {
Nit: style is to leave a blank line between local variables and the
first line of executable code.
> *val = ~0;
> return PCIBIOS_DEVICE_NOT_FOUND;
> }
> - return pci_bus_read_config_byte(dev->bus, dev->devfn, where, val);
> +
> + ret = pci_bus_read_config_byte(dev->bus, dev->devfn, where, val);
> +
> + if (ret > 0)
> + ret = -ERANGE;
I don't understand what you're doing here. pci_bus_read_config_byte()
returns things like PCIBIOS_BAD_REGISTER_NUMBER,
PCIBIOS_FUNC_NOT_SUPPORTED, PCIBIOS_BAD_VENDOR_ID, etc.
These are all positive at this point, so this collapses all of them to
-ERANGE, which throws away the information about the different types
of errors, which is not what we want.
Another coding style nit: normally a check for error would be
immediately after the function call, so omit the blank line in this
case. Generally you can learn things like this by looking at the
existing code and following the same style.
> + return ret;
> }
