Commit 7975c8cc authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: dwc: Remove dwc specific config accessor ops 

Now that all the drivers needing custom config accessors have been
converted to define their own pci_ops, we can remove the DWC specific
function callbacks {rd,wr}_{own,other}_conf.

Link: https://lore.kernel.org/r/20200821035420.380495-13-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
parent c4a42ee9

drivers/pci/controller/dwc/pcie-designware-host.c

+0 −14
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ static int dw_pcie_rd_own_conf(struct pcie_port *pp, int where, int size, 
{

	struct dw_pcie *pci;



	if (pp->ops->rd_own_conf)

		return pp->ops->rd_own_conf(pp, where, size, val);



	pci = to_dw_pcie_from_pp(pp);

	return dw_pcie_read(pci->dbi_base + where, size, val);

}
@@ -38,9 +35,6 @@ static int dw_pcie_wr_own_conf(struct pcie_port *pp, int where, int size, 
{

	struct dw_pcie *pci;



	if (pp->ops->wr_own_conf)

		return pp->ops->wr_own_conf(pp, where, size, val);



	pci = to_dw_pcie_from_pp(pp);

	return dw_pcie_write(pci->dbi_base + where, size, val);

}
@@ -537,10 +531,6 @@ static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus, 
static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,

				 u32 devfn, int where, int size, u32 *val)

{

	if (pp->ops->rd_other_conf)

		return pp->ops->rd_other_conf(pp, bus, devfn, where,

					      size, val);



	return dw_pcie_access_other_conf(pp, bus, devfn, where, size, val,

					 false);

}
@@ -548,10 +538,6 @@ static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, 
static int dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,

				 u32 devfn, int where, int size, u32 val)

{

	if (pp->ops->wr_other_conf)

		return pp->ops->wr_other_conf(pp, bus, devfn, where,

					      size, val);



	return dw_pcie_access_other_conf(pp, bus, devfn, where, size, &val,

					 true);

}

drivers/pci/controller/dwc/pcie-designware.h

+0 −6
Original line number Diff line number Diff line
@@ -160,12 +160,6 @@ enum dw_pcie_device_mode { 
};



struct dw_pcie_host_ops {

	int (*rd_own_conf)(struct pcie_port *pp, int where, int size, u32 *val);

	int (*wr_own_conf)(struct pcie_port *pp, int where, int size, u32 val);

	int (*rd_other_conf)(struct pcie_port *pp, struct pci_bus *bus,

			     unsigned int devfn, int where, int size, u32 *val);

	int (*wr_other_conf)(struct pcie_port *pp, struct pci_bus *bus,

			     unsigned int devfn, int where, int size, u32 val);

	int (*host_init)(struct pcie_port *pp);

	void (*scan_bus)(struct pcie_port *pp);

	void (*set_num_vectors)(struct pcie_port *pp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE