@@ -105,18 +105,19 @@ static int ls1021_pcie_link_up(struct pcie_port *pp)
static void ls1021_pcie_host_init(struct pcie_port *pp)
{
+ struct device *dev = pp->dev;
struct ls_pcie *ls = to_ls_pcie(pp);
u32 index[2];
- ls->scfg = syscon_regmap_lookup_by_phandle(pp->dev->of_node,
+ ls->scfg = syscon_regmap_lookup_by_phandle(dev->of_node,
"fsl,pcie-scfg");
if (IS_ERR(ls->scfg)) {
- dev_err(pp->dev, "No syscfg phandle specified\n");
+ dev_err(dev, "No syscfg phandle specified\n");
ls->scfg = NULL;
return;
}
- if (of_property_read_u32_array(pp->dev->of_node,
+ if (of_property_read_u32_array(dev->of_node,
"fsl,pcie-scfg", index, 2)) {
ls->scfg = NULL;
return;
@@ -231,23 +232,24 @@ static int __init ls_add_pcie_port(struct ls_pcie *ls,
static int __init ls_pcie_probe(struct platform_device *pdev)
{
+ struct device *dev = &pdev->dev;
const struct of_device_id *match;
struct ls_pcie *ls;
struct resource *dbi_base;
int ret;
- match = of_match_device(ls_pcie_of_match, &pdev->dev);
+ match = of_match_device(ls_pcie_of_match, dev);
if (!match)
return -ENODEV;
- ls = devm_kzalloc(&pdev->dev, sizeof(*ls), GFP_KERNEL);
+ ls = devm_kzalloc(dev, sizeof(*ls), GFP_KERNEL);
if (!ls)
return -ENOMEM;
dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
- ls->pp.dbi_base = devm_ioremap_resource(&pdev->dev, dbi_base);
+ ls->pp.dbi_base = devm_ioremap_resource(dev, dbi_base);
if (IS_ERR(ls->pp.dbi_base)) {
- dev_err(&pdev->dev, "missing *regs* space\n");
+ dev_err(dev, "missing *regs* space\n");
return PTR_ERR(ls->pp.dbi_base);
}
Use a local "struct device *dev" for brevity and consistency with other drivers. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- drivers/pci/host/pci-layerscape.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)