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

Commit 792e0a68 authored by Shailendra Verma's avatar Shailendra Verma Committed by Bjorn Helgaas
Browse files

PCI: hisi: Use of_device_get_match_data() to simplify probe 



The only way to call hisi_pcie_probe() is to match an entry in
hisi_pcie_of_match[], so match cannot be NULL.

Use of_device_get_match_data() to retrieve the soc_ops pointer.  No
functional change intended.

[bhelgaas: use of_device_get_match_data(), changelog]
Based-on-suggestion-from: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarShailendra Verma <shailendra.v@samsung.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7ce7d89f

drivers/pci/host/pcie-hisi.c

+3 −5
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ struct hisi_pcie { 
	struct pcie_port pp;		/* pp.dbi_base is DT rc_dbi */

	struct regmap *subctrl;

	u32 port_id;

	struct pcie_soc_ops *soc_ops;

	const struct pcie_soc_ops *soc_ops;

};



/* HipXX PCIe host only supports 32-bit config access */
@@ -259,7 +259,6 @@ static int hisi_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct hisi_pcie *hisi_pcie;

	struct pcie_port *pp;

	const struct of_device_id *match;

	struct resource *reg;

	struct device_driver *driver;

	int ret;
@@ -272,8 +271,7 @@ static int hisi_pcie_probe(struct platform_device *pdev) 
	pp->dev = dev;

	driver = dev->driver;



	match = of_match_device(driver->of_match_table, dev);

	hisi_pcie->soc_ops = (struct pcie_soc_ops *) match->data;

	hisi_pcie->soc_ops = of_device_get_match_data(dev);



	hisi_pcie->subctrl =

	    syscon_regmap_lookup_by_compatible("hisilicon,pcie-sas-subctrl");