* [PATCH 1/1] PCI: imx6: Annotate imx6_add_pcie_port with __init
@ 2014-05-30 6:38 Sachin Kamat
2014-05-30 15:53 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Sachin Kamat @ 2014-05-30 6:38 UTC (permalink / raw)
To: linux-pci; +Cc: r65037, shawn.guo, bhelgaas, sachin.kamat, Sean Cross
imx6_add_pcie_port is called from probe which is annotated with __init.
imx6_add_pcie_port calls dw_pcie_host_init which is also annotated with
__init. Thus it makes sense to annotate imx6_add_pcie_port with __init.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Sean Cross <xobs@kosagi.com>
---
drivers/pci/host/pci-imx6.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index ee082509b0ba..facbf8faa353 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -487,7 +487,7 @@ static struct pcie_host_ops imx6_pcie_host_ops = {
.host_init = imx6_pcie_host_init,
};
-static int imx6_add_pcie_port(struct pcie_port *pp,
+static int __init imx6_add_pcie_port(struct pcie_port *pp,
struct platform_device *pdev)
{
int ret;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 1/1] PCI: imx6: Annotate imx6_add_pcie_port with __init
2014-05-30 6:38 [PATCH 1/1] PCI: imx6: Annotate imx6_add_pcie_port with __init Sachin Kamat
@ 2014-05-30 15:53 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2014-05-30 15:53 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-pci, r65037, shawn.guo, Sean Cross
On Fri, May 30, 2014 at 12:08:48PM +0530, Sachin Kamat wrote:
> imx6_add_pcie_port is called from probe which is annotated with __init.
> imx6_add_pcie_port calls dw_pcie_host_init which is also annotated with
> __init. Thus it makes sense to annotate imx6_add_pcie_port with __init.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Sean Cross <xobs@kosagi.com>
This looks correct to me, so I put it on a pci/host-imx6 branch to squeeze
it in for v3.16. Richard, Shawn, let me know (soonish, since the merge
window may open next week) if you object.
> ---
> drivers/pci/host/pci-imx6.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
> index ee082509b0ba..facbf8faa353 100644
> --- a/drivers/pci/host/pci-imx6.c
> +++ b/drivers/pci/host/pci-imx6.c
> @@ -487,7 +487,7 @@ static struct pcie_host_ops imx6_pcie_host_ops = {
> .host_init = imx6_pcie_host_init,
> };
>
> -static int imx6_add_pcie_port(struct pcie_port *pp,
> +static int __init imx6_add_pcie_port(struct pcie_port *pp,
> struct platform_device *pdev)
> {
> int ret;
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-30 15:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-30 6:38 [PATCH 1/1] PCI: imx6: Annotate imx6_add_pcie_port with __init Sachin Kamat
2014-05-30 15:53 ` Bjorn Helgaas
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).