Commit 0b104773 authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: Constify struct pci_ecam_ops 

struct pci_ecam_ops is typically DT match table data which is defined to
be const. It's also best practice for ops structs to be const. Ideally,
we'd make struct pci_ops const as well, but that becomes pretty
invasive, so for now we just cast it where needed.

Link: https://lore.kernel.org/r/20200409234923.21598-2-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Andrew Murray <amurray@thegoodpenguin.co.uk>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Jonathan Chocron <jonnyc@amazon.com>
Cc: Zhou Wang <wangzhou1@hisilicon.com>
Cc: Robert Richter <rrichter@marvell.com>
Cc: Toan Le <toan@os.amperecomputing.com>
Cc: Marc Gonzalez <marc.w.gonzalez@free.fr>
Cc: Mans Rullgard <mans@mansr.com>
Cc: linux-acpi@vger.kernel.org
parent 8f3d9f35

arch/arm64/kernel/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root) 
	struct device *dev = &root->device->dev;

	struct resource *bus_res = &root->secondary;

	u16 seg = root->segment;

	struct pci_ecam_ops *ecam_ops;

	const struct pci_ecam_ops *ecam_ops;

	struct resource cfgres;

	struct acpi_device *adev;

	struct pci_config_window *cfg;
@@ -185,7 +185,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 


	root_ops->release_info = pci_acpi_generic_release_info;

	root_ops->prepare_resources = pci_acpi_root_prepare_resources;

	root_ops->pci_ops = &ri->cfg->ops->pci_ops;

	root_ops->pci_ops = (struct pci_ops *)&ri->cfg->ops->pci_ops;

	bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg);

	if (!bus)

		return NULL;

drivers/acpi/pci_mcfg.c

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct mcfg_fixup { 
	u32 oem_revision;

	u16 segment;

	struct resource bus_range;

	struct pci_ecam_ops *ops;

	const struct pci_ecam_ops *ops;

	struct resource cfgres;

};
@@ -165,7 +165,7 @@ static int pci_mcfg_quirk_matches(struct mcfg_fixup *f, u16 segment, 


static void pci_mcfg_apply_quirks(struct acpi_pci_root *root,

				  struct resource *cfgres,

				  struct pci_ecam_ops **ecam_ops)

				  const struct pci_ecam_ops **ecam_ops)

{

#ifdef CONFIG_PCI_QUIRKS

	u16 segment = root->segment;
@@ -191,9 +191,9 @@ static void pci_mcfg_apply_quirks(struct acpi_pci_root *root, 
static LIST_HEAD(pci_mcfg_list);



int pci_mcfg_lookup(struct acpi_pci_root *root, struct resource *cfgres,

		    struct pci_ecam_ops **ecam_ops)

		    const struct pci_ecam_ops **ecam_ops)

{

	struct pci_ecam_ops *ops = &pci_generic_ecam_ops;

	const struct pci_ecam_ops *ops = &pci_generic_ecam_ops;

	struct resource *bus_res = &root->secondary;

	u16 seg = root->segment;

	struct mcfg_entry *e;

drivers/pci/controller/dwc/pcie-al.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int al_pcie_init(struct pci_config_window *cfg) 
	return 0;

}



struct pci_ecam_ops al_pcie_ops = {

const struct pci_ecam_ops al_pcie_ops = {

	.bus_shift    = 20,

	.init         =  al_pcie_init,

	.pci_ops      = {

drivers/pci/controller/dwc/pcie-hisi.c

+4 −4
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int hisi_pcie_init(struct pci_config_window *cfg) 
	return 0;

}



struct pci_ecam_ops hisi_pcie_ops = {

const struct pci_ecam_ops hisi_pcie_ops = {

	.bus_shift    = 20,

	.init         =  hisi_pcie_init,

	.pci_ops      = {
@@ -362,7 +362,7 @@ static int hisi_pcie_platform_init(struct pci_config_window *cfg) 
	return 0;

}



struct pci_ecam_ops hisi_pcie_platform_ops = {

const struct pci_ecam_ops hisi_pcie_platform_ops = {

	.bus_shift    = 20,

	.init         =  hisi_pcie_platform_init,

	.pci_ops      = {
@@ -375,11 +375,11 @@ struct pci_ecam_ops hisi_pcie_platform_ops = { 
static const struct of_device_id hisi_pcie_almost_ecam_of_match[] = {

	{

		.compatible =  "hisilicon,hip06-pcie-ecam",

		.data	    = (void *) &hisi_pcie_platform_ops,

		.data	    =  &hisi_pcie_platform_ops,

	},

	{

		.compatible =  "hisilicon,hip07-pcie-ecam",

		.data       = (void *) &hisi_pcie_platform_ops,

		.data       =  &hisi_pcie_platform_ops,

	},

	{},

};

drivers/pci/controller/pci-host-common.c

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static void gen_pci_unmap_cfg(void *ptr) 
}



static struct pci_config_window *gen_pci_init(struct device *dev,

		struct list_head *resources, struct pci_ecam_ops *ops)

		struct list_head *resources, const struct pci_ecam_ops *ops)

{

	int err;

	struct resource cfgres;
@@ -55,7 +55,7 @@ err_out: 
}



int pci_host_common_probe(struct platform_device *pdev,

			  struct pci_ecam_ops *ops)

			  const struct pci_ecam_ops *ops)

{

	struct device *dev = &pdev->dev;

	struct pci_host_bridge *bridge;
@@ -82,7 +82,7 @@ int pci_host_common_probe(struct platform_device *pdev, 
	bridge->dev.parent = dev;

	bridge->sysdata = cfg;

	bridge->busnr = cfg->busr.start;

	bridge->ops = &ops->pci_ops;

	bridge->ops = (struct pci_ops *)&ops->pci_ops;

	bridge->map_irq = of_irq_parse_and_map_pci;

	bridge->swizzle_irq = pci_common_swizzle;

CRA Git | Maintained and supported by SUSTech CRA and CCSE