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

Commit e2dc4f22 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-layerscape' into next 

* pci/host-layerscape:
  PCI: layerscape: Use of_device_get_match_data() to simplify probe

Conflicts:
	drivers/pci/dwc/pci-layerscape.c
parents 68094b4b 6dc2c04f

drivers/pci/dwc/pci-layerscape.c

+1 −6
Original line number Diff line number Diff line
@@ -262,16 +262,11 @@ static int __init ls_add_pcie_port(struct ls_pcie *pcie) 
static int __init ls_pcie_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	const struct of_device_id *match;

	struct dw_pcie *pci;

	struct ls_pcie *pcie;

	struct resource *dbi_base;

	int ret;



	match = of_match_device(ls_pcie_of_match, dev);

	if (!match)

		return -ENODEV;



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

	if (!pcie)

		return -ENOMEM;
@@ -280,7 +275,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev) 
	if (!pci)

		return -ENOMEM;



	pcie->drvdata = match->data;

	pcie->drvdata = of_device_get_match_data(dev);



	pci->dev = dev;

	pci->ops = pcie->drvdata->dw_pcie_ops;