From: Bjorn Helgaas <bhelgaas@google.com>
To: Minghuan Lian <minghuan.Lian@freescale.com>,
Mingkai Hu <mingkai.hu@freescale.com>,
Roy Zang <tie-fei.zang@freescale.com>
Cc: linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 5/7] PCI: layerscape: Add local struct device pointers
Date: Fri, 07 Oct 2016 11:42:25 -0500 [thread overview]
Message-ID: <20161007164225.26341.18734.stgit@bhelgaas-glaptop2.roam.corp.google.com> (raw)
In-Reply-To: <20161007164149.26341.87049.stgit@bhelgaas-glaptop2.roam.corp.google.com>
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(-)
diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c
index 8d10665..bf1ce11 100644
--- a/drivers/pci/host/pci-layerscape.c
+++ b/drivers/pci/host/pci-layerscape.c
@@ -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);
}
next prev parent reply other threads:[~2016-10-07 16:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 16:41 [PATCH 1/7] PCI: layerscape: Name private struct pointer "ls" consistently Bjorn Helgaas
2016-10-07 16:42 ` [PATCH 2/7] PCI: layerscape: Pass device-specific struct to internal functions Bjorn Helgaas
2016-10-07 16:42 ` [PATCH 3/7] PCI: layerscape: Remove redundant struct ls_pcie.dbi Bjorn Helgaas
2016-10-07 16:42 ` [PATCH 4/7] PCI: layerscape: Reorder struct ls_pcie Bjorn Helgaas
2016-10-07 16:42 ` Bjorn Helgaas [this message]
2016-10-07 16:42 ` [PATCH 6/7] PCI: layerscape: Move struct pcie_port setup to probe function Bjorn Helgaas
2016-10-07 16:42 ` [PATCH 7/7] PCI: layerscape: Remove unused ls_add_pcie_port() platform_device arg Bjorn Helgaas
2016-10-07 17:05 ` [PATCH 1/7] PCI: layerscape: Name private struct pointer "ls" consistently Roy Zang
2016-10-07 18:21 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161007164225.26341.18734.stgit@bhelgaas-glaptop2.roam.corp.google.com \
--to=bhelgaas@google.com \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=minghuan.Lian@freescale.com \
--cc=mingkai.hu@freescale.com \
--cc=tie-fei.zang@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).