| Message ID | 001c01cff982$d2e4fa00$78aeee00$%han@samsung.com |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Nov 06, 2014 at 02:30:49PM +0900, Jingoo Han wrote: > The add_pcie_port function is dra7xx-specific. Add dra7xx prefix > to avoid collision in global name space. > > Signed-off-by: Jingoo Han <jg1.han@samsung.com> > Acked-by: Kishon Vijay Abraham I <kishon@ti.com> Applied to pci/host-dra7xx for v3.19, thanks! > --- > - Replace 'exynos' typo with 'dra7xx' in the commit message. > - Added Kishon's Acked-by. > > drivers/pci/host/pci-dra7xx.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c > index 52b34fe..5b4a644 100644 > --- a/drivers/pci/host/pci-dra7xx.c > +++ b/drivers/pci/host/pci-dra7xx.c > @@ -270,8 +270,8 @@ static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg) > return IRQ_HANDLED; > } > > -static int add_pcie_port(struct dra7xx_pcie *dra7xx, > - struct platform_device *pdev) > +static int dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, > + struct platform_device *pdev) > { > int ret; > struct pcie_port *pp; > @@ -398,7 +398,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, dra7xx); > > - ret = add_pcie_port(dra7xx, pdev); > + ret = dra7xx_add_pcie_port(dra7xx, pdev); > if (ret < 0) > goto err_add_port; > > -- > 1.7.9.5 > > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c index 52b34fe..5b4a644 100644 --- a/drivers/pci/host/pci-dra7xx.c +++ b/drivers/pci/host/pci-dra7xx.c @@ -270,8 +270,8 @@ static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg) return IRQ_HANDLED; } -static int add_pcie_port(struct dra7xx_pcie *dra7xx, - struct platform_device *pdev) +static int dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, + struct platform_device *pdev) { int ret; struct pcie_port *pp; @@ -398,7 +398,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dra7xx); - ret = add_pcie_port(dra7xx, pdev); + ret = dra7xx_add_pcie_port(dra7xx, pdev); if (ret < 0) goto err_add_port;