hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PCI: layerscape: 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: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2016-10-06 13:38:05 -05:00
parent f5acb5c51d
commit c11125ebe7
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/pci/host/pci-layerscape.c
View File

@ -106,18 +106,19 @@ static int ls1021_pcie_link_up(struct pcie_port *pp)
static void ls1021_pcie_host_init(struct pcie_port *pp) static void ls1021_pcie_host_init(struct pcie_port *pp)
{ {
struct device *dev = pp->dev;
struct ls_pcie *pcie = to_ls_pcie(pp); struct ls_pcie *pcie = to_ls_pcie(pp);
u32 index[2]; u32 index[2];
pcie->scfg = syscon_regmap_lookup_by_phandle(pp->dev->of_node, pcie->scfg = syscon_regmap_lookup_by_phandle(dev->of_node,
"fsl,pcie-scfg"); "fsl,pcie-scfg");
if (IS_ERR(pcie->scfg)) { if (IS_ERR(pcie->scfg)) {
dev_err(pp->dev, "No syscfg phandle specified\n"); dev_err(dev, "No syscfg phandle specified\n");
pcie->scfg = NULL; pcie->scfg = NULL;
return; 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)) { "fsl,pcie-scfg", index, 2)) {
pcie->scfg = NULL; pcie->scfg = NULL;
return; return;
@ -158,8 +159,9 @@ static void ls_pcie_host_init(struct pcie_port *pp)
static int ls_pcie_msi_host_init(struct pcie_port *pp, static int ls_pcie_msi_host_init(struct pcie_port *pp,
struct msi_controller *chip) struct msi_controller *chip)
{ {
struct device *dev = pp->dev;
struct device_node *np = dev->of_node;
struct device_node *msi_node; struct device_node *msi_node;
struct device_node *np = pp->dev->of_node;
/* /*
* The MSI domain is set by the generic of_msi_configure(). This * The MSI domain is set by the generic of_msi_configure(). This
@ -169,7 +171,7 @@ static int ls_pcie_msi_host_init(struct pcie_port *pp,
*/ */
msi_node = of_parse_phandle(np, "msi-parent", 0); msi_node = of_parse_phandle(np, "msi-parent", 0);
if (!msi_node) { if (!msi_node) {
dev_err(pp->dev, "failed to find msi-parent\n"); dev_err(dev, "failed to find msi-parent\n");
return -EINVAL; return -EINVAL;
} }
@ -215,16 +217,17 @@ static const struct of_device_id ls_pcie_of_match[] = {
static int __init ls_add_pcie_port(struct pcie_port *pp, static int __init ls_add_pcie_port(struct pcie_port *pp,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
int ret; int ret;
struct ls_pcie *pcie = to_ls_pcie(pp); struct ls_pcie *pcie = to_ls_pcie(pp);
pp->dev = &pdev->dev; pp->dev = dev;
pp->dbi_base = pcie->dbi; pp->dbi_base = pcie->dbi;
pp->ops = pcie->drvdata->ops; pp->ops = pcie->drvdata->ops;
ret = dw_pcie_host_init(pp); ret = dw_pcie_host_init(pp);
if (ret) { if (ret) {
dev_err(pp->dev, "failed to initialize host\n"); dev_err(dev, "failed to initialize host\n");
return ret; return ret;
} }
@ -233,23 +236,24 @@ static int __init ls_add_pcie_port(struct pcie_port *pp,
static int __init ls_pcie_probe(struct platform_device *pdev) static int __init ls_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
const struct of_device_id *match; const struct of_device_id *match;
struct ls_pcie *pcie; struct ls_pcie *pcie;
struct resource *dbi_base; struct resource *dbi_base;
int ret; int ret;
match = of_match_device(ls_pcie_of_match, &pdev->dev); match = of_match_device(ls_pcie_of_match, dev);
if (!match) if (!match)
return -ENODEV; return -ENODEV;
pcie = devm_kzalloc(&pdev->dev, sizeof(*pcie), GFP_KERNEL); pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
if (!pcie) if (!pcie)
return -ENOMEM; return -ENOMEM;
dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
pcie->dbi = devm_ioremap_resource(&pdev->dev, dbi_base); pcie->dbi = devm_ioremap_resource(dev, dbi_base);
if (IS_ERR(pcie->dbi)) { if (IS_ERR(pcie->dbi)) {
dev_err(&pdev->dev, "missing *regs* space\n"); dev_err(dev, "missing *regs* space\n");
return PTR_ERR(pcie->dbi); return PTR_ERR(pcie->dbi);
} }