| Message ID | 000601cf7f30$31b53270$951f9750$%han@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Tue, Jun 03, 2014 at 10:31:58PM +0900, Jingoo Han wrote: > The add_pcie_port/pcie_init functions are Exynos-specific. > Add exynos prefix to avoid collision in global name space. > > Signed-off-by: Jingoo Han <jg1.han@samsung.com> Applied to pci/host-exynos for v3.17, thanks! > --- > drivers/pci/host/pci-exynos.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c > index 1632661..2f59851 100644 > --- a/drivers/pci/host/pci-exynos.c > +++ b/drivers/pci/host/pci-exynos.c > @@ -509,8 +509,8 @@ static struct pcie_host_ops exynos_pcie_host_ops = { > .host_init = exynos_pcie_host_init, > }; > > -static int __init add_pcie_port(struct pcie_port *pp, > - struct platform_device *pdev) > +static int __init exynos_add_pcie_port(struct pcie_port *pp, > + struct platform_device *pdev) > { > int ret; > > @@ -616,7 +616,7 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) > goto fail_bus_clk; > } > > - ret = add_pcie_port(pp, pdev); > + ret = exynos_add_pcie_port(pp, pdev); > if (ret < 0) > goto fail_bus_clk; > > @@ -657,11 +657,11 @@ static struct platform_driver exynos_pcie_driver = { > > /* Exynos PCIe driver does not allow module unload */ > > -static int __init pcie_init(void) > +static int __init exynos_pcie_init(void) > { > return platform_driver_probe(&exynos_pcie_driver, exynos_pcie_probe); > } > -subsys_initcall(pcie_init); > +subsys_initcall(exynos_pcie_init); > > MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>"); > MODULE_DESCRIPTION("Samsung PCIe host controller driver"); > -- > 1.7.10.4 > > -- 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
On Wednesday, June 18, 2014 7:06 AM, Bjorn Helgaas wrote: > On Tue, Jun 03, 2014 at 10:31:58PM +0900, Jingoo Han wrote: > > The add_pcie_port/pcie_init functions are Exynos-specific. > > Add exynos prefix to avoid collision in global name space. > > > > Signed-off-by: Jingoo Han <jg1.han@samsung.com> > > Applied to pci/host-exynos for v3.17, thanks! Hi Bjorn, I cannot find this patch from pci git. Please apply this patch to pci git. Thank you. Best regards, Jingoo Han > > > --- > > drivers/pci/host/pci-exynos.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c > > index 1632661..2f59851 100644 > > --- a/drivers/pci/host/pci-exynos.c > > +++ b/drivers/pci/host/pci-exynos.c > > @@ -509,8 +509,8 @@ static struct pcie_host_ops exynos_pcie_host_ops = { > > .host_init = exynos_pcie_host_init, > > }; > > > > -static int __init add_pcie_port(struct pcie_port *pp, > > - struct platform_device *pdev) > > +static int __init exynos_add_pcie_port(struct pcie_port *pp, > > + struct platform_device *pdev) > > { > > int ret; > > > > @@ -616,7 +616,7 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) > > goto fail_bus_clk; > > } > > > > - ret = add_pcie_port(pp, pdev); > > + ret = exynos_add_pcie_port(pp, pdev); > > if (ret < 0) > > goto fail_bus_clk; > > > > @@ -657,11 +657,11 @@ static struct platform_driver exynos_pcie_driver = { > > > > /* Exynos PCIe driver does not allow module unload */ > > > > -static int __init pcie_init(void) > > +static int __init exynos_pcie_init(void) > > { > > return platform_driver_probe(&exynos_pcie_driver, exynos_pcie_probe); > > } > > -subsys_initcall(pcie_init); > > +subsys_initcall(exynos_pcie_init); > > > > MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>"); > > MODULE_DESCRIPTION("Samsung PCIe host controller driver"); > > -- > > 1.7.10.4 -- 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-exynos.c b/drivers/pci/host/pci-exynos.c index 1632661..2f59851 100644 --- a/drivers/pci/host/pci-exynos.c +++ b/drivers/pci/host/pci-exynos.c @@ -509,8 +509,8 @@ static struct pcie_host_ops exynos_pcie_host_ops = { .host_init = exynos_pcie_host_init, }; -static int __init add_pcie_port(struct pcie_port *pp, - struct platform_device *pdev) +static int __init exynos_add_pcie_port(struct pcie_port *pp, + struct platform_device *pdev) { int ret; @@ -616,7 +616,7 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) goto fail_bus_clk; } - ret = add_pcie_port(pp, pdev); + ret = exynos_add_pcie_port(pp, pdev); if (ret < 0) goto fail_bus_clk; @@ -657,11 +657,11 @@ static struct platform_driver exynos_pcie_driver = { /* Exynos PCIe driver does not allow module unload */ -static int __init pcie_init(void) +static int __init exynos_pcie_init(void) { return platform_driver_probe(&exynos_pcie_driver, exynos_pcie_probe); } -subsys_initcall(pcie_init); +subsys_initcall(exynos_pcie_init); MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>"); MODULE_DESCRIPTION("Samsung PCIe host controller driver");
The add_pcie_port/pcie_init functions are Exynos-specific. Add exynos prefix to avoid collision in global name space. Signed-off-by: Jingoo Han <jg1.han@samsung.com> --- drivers/pci/host/pci-exynos.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)