iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: artpec6: Pass device-specific struct to internal functions

Browse Source 
Only interfaces used from outside the driver, e.g., those called by the
DesignWare core, need to accept pointers to the generic struct pcie_port.
Internal interfaces can accept pointers to the device-specific struct,
which makes them more straightforward.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
Bjorn Helgaas
2016-10-06 13:30:56 -05:00
parent acaa88e4e2
commit b6f5f434f0
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/pci/host/pcie-artpec6.c
View File

@@ -78,9 +78,9 @@ static void artpec6_pcie_writel(struct artpec6_pcie *artpec6_pcie, u32 offset, u
regmap_write(artpec6_pcie->regmap, offset, val); regmap_write(artpec6_pcie->regmap, offset, val);
} }
static int artpec6_pcie_establish_link(struct pcie_port *pp) static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie)
{ {
struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pp); struct pcie_port *pp = &artpec6_pcie->pp;
u32 val; u32 val;
unsigned int retries; unsigned int retries;
@@ -165,16 +165,20 @@ static int artpec6_pcie_establish_link(struct pcie_port *pp)
return -ETIMEDOUT; return -ETIMEDOUT;
} }
static void artpec6_pcie_enable_interrupts(struct pcie_port *pp) static void artpec6_pcie_enable_interrupts(struct artpec6_pcie *artpec6_pcie)
{ {
struct pcie_port *pp = &artpec6_pcie->pp;
if (IS_ENABLED(CONFIG_PCI_MSI)) if (IS_ENABLED(CONFIG_PCI_MSI))
dw_pcie_msi_init(pp); dw_pcie_msi_init(pp);
} }
static void artpec6_pcie_host_init(struct pcie_port *pp) static void artpec6_pcie_host_init(struct pcie_port *pp)
{ {
artpec6_pcie_establish_link(pp); struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pp);
artpec6_pcie_enable_interrupts(pp);
artpec6_pcie_establish_link(artpec6_pcie);
artpec6_pcie_enable_interrupts(artpec6_pcie);
} }
static struct pcie_host_ops artpec6_pcie_host_ops = { static struct pcie_host_ops artpec6_pcie_host_ops = {
@@ -183,14 +187,16 @@ static struct pcie_host_ops artpec6_pcie_host_ops = {
static irqreturn_t artpec6_pcie_msi_handler(int irq, void *arg) static irqreturn_t artpec6_pcie_msi_handler(int irq, void *arg)
{ {
struct pcie_port *pp = arg; struct artpec6_pcie *artpec6_pcie = arg;
struct pcie_port *pp = &artpec6_pcie->pp;
return dw_handle_msi_irq(pp); return dw_handle_msi_irq(pp);
} }
static int artpec6_add_pcie_port(struct pcie_port *pp, static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct pcie_port *pp = &artpec6_pcie->pp;
struct device *dev = pp->dev; struct device *dev = pp->dev;
int ret; int ret;
@@ -204,7 +210,7 @@ static int artpec6_add_pcie_port(struct pcie_port *pp,
ret = devm_request_irq(dev, pp->msi_irq, ret = devm_request_irq(dev, pp->msi_irq,
artpec6_pcie_msi_handler, artpec6_pcie_msi_handler,
IRQF_SHARED | IRQF_NO_THREAD, IRQF_SHARED | IRQF_NO_THREAD,
"artpec6-pcie-msi", pp); "artpec6-pcie-msi", artpec6_pcie);
if (ret) { if (ret) {
dev_err(dev, "failed to request MSI irq\n"); dev_err(dev, "failed to request MSI irq\n");
return ret; return ret;
@@ -255,7 +261,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev)
if (IS_ERR(artpec6_pcie->regmap)) if (IS_ERR(artpec6_pcie->regmap))
return PTR_ERR(artpec6_pcie->regmap); return PTR_ERR(artpec6_pcie->regmap);
ret = artpec6_add_pcie_port(pp, pdev); ret = artpec6_add_pcie_port(artpec6_pcie, pdev);
if (ret < 0) if (ret < 0)
return ret; return ret;