RE: [RFC PATCH 06/35] PCI: Tidy Success/Failure checks

Gustavo Pimentel
2020-07-13T13:59:47Z

On Mon, Jul 13, 2020 at 13:22:18, Saheed O. Bolarinwa
<refactormyself@gmail.com> wrote:

> Remove unnecessary check for 0.
>
> Signed-off-by: "Saheed O. Bolarinwa" <refactormyself@gmail.com>
> ---
> This patch depends on PATCH 05/35
>
> drivers/pci/controller/dwc/pci-meson.c | 2 +-
> drivers/pci/controller/dwc/pcie-designware-host.c | 2 +-
> drivers/pci/controller/pci-xgene.c | 3 +--
> drivers/pci/controller/pcie-altera.c | 4 ++--
> drivers/pci/controller/pcie-iproc.c | 2 +-
> drivers/pci/controller/pcie-rcar-host.c | 4 ++--
> 6 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c
> index 58142f03d300..8203d5f95d28 100644
> --- a/drivers/pci/controller/dwc/pci-meson.c
> +++ b/drivers/pci/controller/dwc/pci-meson.c
> @@ -390,7 +390,7 @@ static int meson_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,
> int ret;
>
> ret = dw_pcie_read(pci->dbi_base + where, size, val);
> - if (ret != 0)
> + if (ret)
> return ret;
>
> /*
> diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
> index 7c97c54f787c..2dd3965365f6 100644
> --- a/drivers/pci/controller/dwc/pcie-designware-host.c
> +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
> @@ -459,7 +459,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
> }
>
> ret = dw_pcie_rd_own_conf(pp, PCI_HEADER_TYPE, 1, &hdr_type);
> - if (ret != 0) {
> + if (ret) {
> dev_err(pci->dev, "Failed reading PCI_HEADER_TYPE cfg space reg (ret: 0x%x)\n",
> ret);
> ret = pcibios_err_to_errno(ret);
> diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
> index bf74f0a8b451..8d55cfc4ff8a 100644
> --- a/drivers/pci/controller/pci-xgene.c
> +++ b/drivers/pci/controller/pci-xgene.c
> @@ -167,8 +167,7 @@ static int xgene_pcie_config_read32(struct pci_bus *bus, unsigned int devfn,
> {
> struct xgene_pcie_port *port = pcie_bus_to_port(bus);
>
> - if (pci_generic_config_read32(bus, devfn, where & ~0x3, 4, val) !=
> - 0)
> + if (pci_generic_config_read32(bus, devfn, where & ~0x3, 4, val))
> return PCIBIOS_DEVICE_NOT_FOUND;
>
> /*
> diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c
> index 96f5bda32b58..9f7b12ad0c04 100644
> --- a/drivers/pci/controller/pcie-altera.c
> +++ b/drivers/pci/controller/pcie-altera.c
> @@ -367,7 +367,7 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,
> value, false);
>
> ret = pcie->pcie_data->ops->tlp_read_pkt(pcie, NULL);
> - if (ret != 0)
> + if (ret)
> return ret;
>
> /*
> @@ -453,7 +453,7 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,
>
> ret = tlp_cfg_dword_read(pcie, busno, devfn,
> (where & ~DWORD_MASK), byte_en, &data);
> - if (ret != 0)
> + if (ret)
> return ret;
>
> switch (size) {
> diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c
> index dac9352c0cb2..d34c9457fbe4 100644
> --- a/drivers/pci/controller/pcie-iproc.c
> +++ b/drivers/pci/controller/pcie-iproc.c
> @@ -584,7 +584,7 @@ static int iproc_pcie_config_read(struct pci_bus *bus, unsigned int devfn,
> /* root complex access */
> if (busno == 0) {
> ret = pci_generic_config_read32(bus, devfn, where, size, val);
> - if (ret == 0)
> + if (!ret)
> iproc_pcie_fix_cap(pcie, where, val);
>
> return ret;
> diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c
> index 363a8630de28..2bb250c6f767 100644
> --- a/drivers/pci/controller/pcie-rcar-host.c
> +++ b/drivers/pci/controller/pcie-rcar-host.c
> @@ -157,7 +157,7 @@ static int rcar_pcie_read_conf(struct pci_bus *bus, unsigned int devfn,
>
> ret = rcar_pcie_config_access(host, RCAR_PCI_ACCESS_READ,
> bus, devfn, where, val);
> - if (ret != 0) {
> + if (ret) {
> *val = 0xffffffff;
> return ret;
> }
> @@ -184,7 +184,7 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn,
>
> ret = rcar_pcie_config_access(host, RCAR_PCI_ACCESS_READ,
> bus, devfn, where, &data);
> - if (ret != 0)
> + if (ret)
> return ret;
>
> dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08x\n",
> --
> 2.18.2

Seems harmless to me.