* [PATCH] PCI: spear: Add exynos spear13xx before add_pcie_port/pcie_init
@ 2014-11-06 1:13 Jingoo Han
2014-11-06 1:29 ` [PATCH V2] PCI: spear: Add " Jingoo Han
2014-11-10 6:36 ` [PATCH] PCI: spear: Add exynos " Viresh Kumar
0 siblings, 2 replies; 5+ messages in thread
From: Jingoo Han @ 2014-11-06 1:13 UTC (permalink / raw)
To: 'Bjorn Helgaas'
Cc: linux-pci, 'Mohit Kumar', 'Viresh Kumar',
'Pratyush Anand', 'Jingoo Han'
The add_pcie_port/pcie_init functions are SPEAr13xx-specific.
Add exynos prefix to avoid collision in global name space.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V2] PCI: spear: Add spear13xx before add_pcie_port/pcie_init
2014-11-06 1:13 [PATCH] PCI: spear: Add exynos spear13xx before add_pcie_port/pcie_init Jingoo Han
@ 2014-11-06 1:29 ` Jingoo Han
2014-11-10 6:38 ` Viresh Kumar
2014-11-13 16:45 ` Bjorn Helgaas
2014-11-10 6:36 ` [PATCH] PCI: spear: Add exynos " Viresh Kumar
1 sibling, 2 replies; 5+ messages in thread
From: Jingoo Han @ 2014-11-06 1:29 UTC (permalink / raw)
To: 'Bjorn Helgaas'
Cc: linux-pci, 'Mohit Kumar', 'Viresh Kumar',
'Pratyush Anand', 'Jingoo Han'
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] PCI: spear: Add exynos spear13xx before add_pcie_port/pcie_init
2014-11-06 1:13 [PATCH] PCI: spear: Add exynos spear13xx before add_pcie_port/pcie_init Jingoo Han
2014-11-06 1:29 ` [PATCH V2] PCI: spear: Add " Jingoo Han
@ 2014-11-10 6:36 ` Viresh Kumar
1 sibling, 0 replies; 5+ messages in thread
From: Viresh Kumar @ 2014-11-10 6:36 UTC (permalink / raw)
To: Jingoo Han
Cc: Bjorn Helgaas, linux-pci@vger.kernel.org, Mohit Kumar,
Pratyush Anand
On 6 November 2014 06:43, Jingoo Han <jg1.han@samsung.com> wrote:
> The add_pcie_port/pcie_init functions are SPEAr13xx-specific.
> Add exynos prefix to avoid collision in global name space.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
> drivers/pci/host/pcie-spear13xx.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
The diff looks fine but log and subject aren't correct.. SPEAr13xx is
not an Exynos SoC, but is from ST Microelectronics.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V2] PCI: spear: Add spear13xx before add_pcie_port/pcie_init
2014-11-06 1:29 ` [PATCH V2] PCI: spear: Add " Jingoo Han
@ 2014-11-10 6:38 ` Viresh Kumar
2014-11-13 16:45 ` Bjorn Helgaas
1 sibling, 0 replies; 5+ messages in thread
From: Viresh Kumar @ 2014-11-10 6:38 UTC (permalink / raw)
To: Jingoo Han
Cc: Bjorn Helgaas, linux-pci@vger.kernel.org, Mohit Kumar,
Pratyush Anand
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V2] PCI: spear: Add spear13xx before add_pcie_port/pcie_init
2014-11-06 1:29 ` [PATCH V2] PCI: spear: Add " Jingoo Han
2014-11-10 6:38 ` Viresh Kumar
@ 2014-11-13 16:45 ` Bjorn Helgaas
1 sibling, 0 replies; 5+ messages in thread
From: Bjorn Helgaas @ 2014-11-13 16:45 UTC (permalink / raw)
To: Jingoo Han
Cc: linux-pci, 'Mohit Kumar', 'Viresh Kumar',
'Pratyush Anand'
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
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-11-13 16:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-06 1:13 [PATCH] PCI: spear: Add exynos spear13xx before add_pcie_port/pcie_init Jingoo Han
2014-11-06 1:29 ` [PATCH V2] PCI: spear: Add " Jingoo Han
2014-11-10 6:38 ` Viresh Kumar
2014-11-13 16:45 ` Bjorn Helgaas
2014-11-10 6:36 ` [PATCH] PCI: spear: Add exynos " Viresh Kumar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).