| Message ID | 1401431928-15096-1-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
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 > -- 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-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;
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(-)