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

Commit 88790f99 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: hisi: Add local struct device pointers 



Use a local "struct device *dev" for brevity and consistency with other
drivers.  No functional change intended.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent f5acb5c5

drivers/pci/host/pcie-hisi.c

+14 −12
Original line number Diff line number Diff line
@@ -143,16 +143,17 @@ static struct pcie_host_ops hisi_pcie_host_ops = { 
static int hisi_add_pcie_port(struct pcie_port *pp,

				     struct platform_device *pdev)

{

	struct device *dev = pp->dev;

	int ret;

	u32 port_id;

	struct hisi_pcie *hisi_pcie = to_hisi_pcie(pp);



	if (of_property_read_u32(pdev->dev.of_node, "port-id", &port_id)) {

		dev_err(&pdev->dev, "failed to read port-id\n");

	if (of_property_read_u32(dev->of_node, "port-id", &port_id)) {

		dev_err(dev, "failed to read port-id\n");

		return -EINVAL;

	}

	if (port_id > 3) {

		dev_err(&pdev->dev, "Invalid port-id: %d\n", port_id);

		dev_err(dev, "Invalid port-id: %d\n", port_id);

		return -EINVAL;

	}

	hisi_pcie->port_id = port_id;
@@ -161,7 +162,7 @@ static int hisi_add_pcie_port(struct pcie_port *pp, 


	ret = dw_pcie_host_init(pp);

	if (ret) {

		dev_err(&pdev->dev, "failed to initialize host\n");

		dev_err(dev, "failed to initialize host\n");

		return ret;

	}
@@ -170,6 +171,7 @@ static int hisi_add_pcie_port(struct pcie_port *pp, 


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;
@@ -177,28 +179,28 @@ static int hisi_pcie_probe(struct platform_device *pdev) 
	struct device_driver *driver;

	int ret;



	hisi_pcie = devm_kzalloc(&pdev->dev, sizeof(*hisi_pcie), GFP_KERNEL);

	hisi_pcie = devm_kzalloc(dev, sizeof(*hisi_pcie), GFP_KERNEL);

	if (!hisi_pcie)

		return -ENOMEM;



	pp = &hisi_pcie->pp;

	pp->dev = &pdev->dev;

	driver = (pdev->dev).driver;

	pp->dev = dev;

	driver = dev->driver;



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

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

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



	hisi_pcie->subctrl =

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

	if (IS_ERR(hisi_pcie->subctrl)) {

		dev_err(pp->dev, "cannot get subctrl base\n");

		dev_err(dev, "cannot get subctrl base\n");

		return PTR_ERR(hisi_pcie->subctrl);

	}



	reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi");

	hisi_pcie->reg_base = devm_ioremap_resource(&pdev->dev, reg);

	hisi_pcie->reg_base = devm_ioremap_resource(dev, reg);

	if (IS_ERR(hisi_pcie->reg_base)) {

		dev_err(pp->dev, "cannot get rc_dbi base\n");

		dev_err(dev, "cannot get rc_dbi base\n");

		return PTR_ERR(hisi_pcie->reg_base);

	}
@@ -210,7 +212,7 @@ static int hisi_pcie_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, hisi_pcie);



	dev_warn(pp->dev, "only 32-bit config accesses supported; smaller writes may corrupt adjacent RW1C fields\n");

	dev_warn(dev, "only 32-bit config accesses supported; smaller writes may corrupt adjacent RW1C fields\n");



	return 0;

}