Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eb12c3b authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bjorn Helgaas
Browse files

PCI: rcar: Remove redundant config accessor register number checks 



The PCI core will have already checked the configuration register address
before calling the {read|write}() methods; so don't check it again in these
methods.

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarPhil Edworthy <phil.edworthy@renesas.com>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 7171511e

drivers/pci/host/pcie-rcar.c

+0 −10
Original line number Diff line number Diff line
@@ -260,11 +260,6 @@ static int rcar_pcie_read_conf(struct pci_bus *bus, unsigned int devfn, 
	struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);

	int ret;



	if ((size == 2) && (where & 1))

		return PCIBIOS_BAD_REGISTER_NUMBER;

	else if ((size == 4) && (where & 3))

		return PCIBIOS_BAD_REGISTER_NUMBER;



	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,

				      bus, devfn, where, val);

	if (ret != PCIBIOS_SUCCESSFUL) {
@@ -291,11 +286,6 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn, 
	int shift, ret;

	u32 data;



	if ((size == 2) && (where & 1))

		return PCIBIOS_BAD_REGISTER_NUMBER;

	else if ((size == 4) && (where & 3))

		return PCIBIOS_BAD_REGISTER_NUMBER;



	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,

				      bus, devfn, where, &data);

	if (ret != PCIBIOS_SUCCESSFUL)