PCI: imx6: Probe in module_init(), not fs_initcall()

lynxeye-dev · bjorn-helgaas · commit 61da50da903f · 2014-09-05T09:36:48.000-06:00
This effectively reverts f216f57 ("PCI: imx6: Probe the PCIe in fs_initcall()") as the resource allocation issue that prevented the driver from working properly at module_initcall level is now fixed in pcie-designware.c. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Richard Zhu <r65037@freescale.com>
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
@@ -647,7 +647,7 @@ static int __init imx6_pcie_init(void)
 {
 	return platform_driver_probe(&imx6_pcie_driver, imx6_pcie_probe);
 }
-fs_initcall(imx6_pcie_init);
+module_init(imx6_pcie_init);
 
 MODULE_AUTHOR("Sean Cross <xobs@kosagi.com>");
 MODULE_DESCRIPTION("Freescale i.MX6 PCIe host controller driver");

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ static int __init imx6_pcie_init(void)`
`647`	`647`	`{`
`648`	`648`	`return platform_driver_probe(&imx6_pcie_driver, imx6_pcie_probe);`
`649`	`649`	`}`
`650`		`-fs_initcall(imx6_pcie_init);`
	`650`	`+module_init(imx6_pcie_init);`
`651`	`651`
`652`	`652`	`MODULE_AUTHOR("Sean Cross <xobs@kosagi.com>");`
`653`	`653`	`MODULE_DESCRIPTION("Freescale i.MX6 PCIe host controller driver");`