Skip to contentSkip to conversation

PCI: dra7xx: Add dra7xx prefix before add_pcie_port

PATCH Superseded Jingoo Han 3 participants 5 messages Nov 6, 2014 – Nov 13, 2014 PCI

lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/1 PCI: dra7xx: Add dra7xx prefix before add_pcie_port

The add_pcie_port function is dra7xx-specific. Add exynos prefix to avoid collision in global name space.

---
 drivers/pci/host/pci-dra7xx.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pci/host/pci-dra7xx.c +3 -3
index 52b34fe..5b4a644 100644
@@ -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;
 
Signature · 1 line
1.7.9.5
Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines · Jingoo Han

The add_pcie_port function is dra7xx-specific. Add exynos prefix to avoid collision in global name space.

%s/exynos/dra7xx

After fixing this you can add

Quoted 31 lines
---
 drivers/pci/host/pci-dra7xx.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pci/host/pci-dra7xx.c +3 -3
index 52b34fe..5b4a644 100644
@@ -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;
 
author
#2 lore raw
Quoted 6 lines · Kishon Vijay Abraham I
Quoted 2 lines · Jingoo Han

The add_pcie_port function is dra7xx-specific. Add exynos prefix to avoid collision in global name space.

%s/exynos/dra7xx

Sorry, it is my bad. I will send patch v2 soon.

Quoted 3 lines

After fixing this you can add

I appreciated you Acked-by.

Best regards,
Jingoo Han

Quoted 5 lines
Quoted 5 lines
---
 drivers/pci/host/pci-dra7xx.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
author
#3 lore raw

PATCH v2 1/1 PCI: dra7xx: Add dra7xx prefix before add_pcie_port

In reply to Jingoo Han

The add_pcie_port function is dra7xx-specific. Add dra7xx prefix to avoid collision in global name space.

---
- 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(-)
drivers/pci/host/pci-dra7xx.c +3 -3
index 52b34fe..5b4a644 100644
@@ -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;
 
Signature · 1 line
1.7.9.5
maintainer Applied
#4 lore raw
Quoted 5 lines · Jingoo Han

The add_pcie_port function is dra7xx-specific. Add dra7xx prefix to avoid collision in global name space.

Applied to pci/host-dra7xx for v3.19, thanks!

Quoted 35 lines

---
- 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(-)
drivers/pci/host/pci-dra7xx.c +3 -3
index 52b34fe..5b4a644 100644
@@ -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;
 
Signature · 1 line
1.7.9.5