| Message ID | 001601cff961$232f2570$698d7050$%han@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On 6 November 2014 06:59, Jingoo Han <jg1.han@samsung.com> wrote: > The add_pcie_port/pcie_init functions are SPEAr13xx-specific. > Add spear13xx prefix to avoid collision in global name space. > > Signed-off-by: Jingoo Han <jg1.han@samsung.com> > --- > Change since v1: > - Remove 'exynos' typo from the commit message. Its better now, sorry for earlier reply. > > drivers/pci/host/pcie-spear13xx.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/host/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c > index 85f594e..63f869f 100644 > --- a/drivers/pci/host/pcie-spear13xx.c > +++ b/drivers/pci/host/pcie-spear13xx.c > @@ -269,7 +269,8 @@ static struct pcie_host_ops spear13xx_pcie_host_ops = { > .host_init = spear13xx_pcie_host_init, > }; > > -static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) > +static int spear13xx_add_pcie_port(struct pcie_port *pp, > + struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > int ret; > @@ -352,7 +353,7 @@ static int __init spear13xx_pcie_probe(struct platform_device *pdev) > if (of_property_read_bool(np, "st,pcie-is-gen1")) > spear13xx_pcie->is_gen1 = true; > > - ret = add_pcie_port(pp, pdev); > + ret = spear13xx_add_pcie_port(pp, pdev); > if (ret < 0) > goto fail_clk; > > @@ -382,11 +383,11 @@ static struct platform_driver spear13xx_pcie_driver __initdata = { > > /* SPEAr13xx PCIe driver does not allow module unload */ > > -static int __init pcie_init(void) > +static int __init spear13xx_pcie_init(void) > { > return platform_driver_register(&spear13xx_pcie_driver); > } > -module_init(pcie_init); > +module_init(spear13xx_pcie_init); > > MODULE_DESCRIPTION("ST Microelectronics SPEAr13xx PCIe host controller driver"); > MODULE_AUTHOR("Pratyush Anand <pratyush.anand@st.com>"); Acked-by: Viresh Kumar <viresh.kumar@linaro.org> -- 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 Thu, Nov 06, 2014 at 10:29:41AM +0900, Jingoo Han wrote: > The add_pcie_port/pcie_init functions are SPEAr13xx-specific. > Add spear13xx prefix to avoid collision in global name space. > > Signed-off-by: Jingoo Han <jg1.han@samsung.com> Applied with Viresh's ack to pci/host-spear for v3.19, thanks! > --- > Change since v1: > - Remove 'exynos' typo from the commit message. > > drivers/pci/host/pcie-spear13xx.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/host/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c > index 85f594e..63f869f 100644 > --- a/drivers/pci/host/pcie-spear13xx.c > +++ b/drivers/pci/host/pcie-spear13xx.c > @@ -269,7 +269,8 @@ static struct pcie_host_ops spear13xx_pcie_host_ops = { > .host_init = spear13xx_pcie_host_init, > }; > > -static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) > +static int spear13xx_add_pcie_port(struct pcie_port *pp, > + struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > int ret; > @@ -352,7 +353,7 @@ static int __init spear13xx_pcie_probe(struct platform_device *pdev) > if (of_property_read_bool(np, "st,pcie-is-gen1")) > spear13xx_pcie->is_gen1 = true; > > - ret = add_pcie_port(pp, pdev); > + ret = spear13xx_add_pcie_port(pp, pdev); > if (ret < 0) > goto fail_clk; > > @@ -382,11 +383,11 @@ static struct platform_driver spear13xx_pcie_driver __initdata = { > > /* SPEAr13xx PCIe driver does not allow module unload */ > > -static int __init pcie_init(void) > +static int __init spear13xx_pcie_init(void) > { > return platform_driver_register(&spear13xx_pcie_driver); > } > -module_init(pcie_init); > +module_init(spear13xx_pcie_init); > > MODULE_DESCRIPTION("ST Microelectronics SPEAr13xx PCIe host controller driver"); > MODULE_AUTHOR("Pratyush Anand <pratyush.anand@st.com>"); > -- > 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/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c index 85f594e..63f869f 100644 --- a/drivers/pci/host/pcie-spear13xx.c +++ b/drivers/pci/host/pcie-spear13xx.c @@ -269,7 +269,8 @@ static struct pcie_host_ops spear13xx_pcie_host_ops = { .host_init = spear13xx_pcie_host_init, }; -static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) +static int spear13xx_add_pcie_port(struct pcie_port *pp, + struct platform_device *pdev) { struct device *dev = &pdev->dev; int ret; @@ -352,7 +353,7 @@ static int __init spear13xx_pcie_probe(struct platform_device *pdev) if (of_property_read_bool(np, "st,pcie-is-gen1")) spear13xx_pcie->is_gen1 = true; - ret = add_pcie_port(pp, pdev); + ret = spear13xx_add_pcie_port(pp, pdev); if (ret < 0) goto fail_clk; @@ -382,11 +383,11 @@ static struct platform_driver spear13xx_pcie_driver __initdata = { /* SPEAr13xx PCIe driver does not allow module unload */ -static int __init pcie_init(void) +static int __init spear13xx_pcie_init(void) { return platform_driver_register(&spear13xx_pcie_driver); } -module_init(pcie_init); +module_init(spear13xx_pcie_init); MODULE_DESCRIPTION("ST Microelectronics SPEAr13xx PCIe host controller driver"); MODULE_AUTHOR("Pratyush Anand <pratyush.anand@st.com>");
The add_pcie_port/pcie_init functions are SPEAr13xx-specific. Add spear13xx prefix to avoid collision in global name space. Signed-off-by: Jingoo Han <jg1.han@samsung.com> --- Change since v1: - Remove 'exynos' typo from the commit message. drivers/pci/host/pcie-spear13xx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)