From: Bjorn Helgaas <bhelgaas@google.com>
To: Jingoo Han <jg1.han@samsung.com>
Cc: linux-pci@vger.kernel.org, 'Mohit Kumar' <mohit.kumar@st.com>,
'Viresh Kumar' <viresh.kumar@linaro.org>,
'Pratyush Anand' <pratyush.anand@st.com>
Subject: Re: [PATCH V2] PCI: spear: Add spear13xx before add_pcie_port/pcie_init
Date: Thu, 13 Nov 2014 09:45:25 -0700 [thread overview]
Message-ID: <20141113164525.GC5064@google.com> (raw)
In-Reply-To: <001601cff961$232f2570$698d7050$%han@samsung.com>
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
>
>
next prev parent reply other threads:[~2014-11-13 16:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2014-11-10 6:36 ` [PATCH] PCI: spear: Add exynos " Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141113164525.GC5064@google.com \
--to=bhelgaas@google.com \
--cc=jg1.han@samsung.com \
--cc=linux-pci@vger.kernel.org \
--cc=mohit.kumar@st.com \
--cc=pratyush.anand@st.com \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).