From: ludovic.desroches@atmel.com Date: Mon, 1 Dec 2014 14:35:08 +0000 (+0100) Subject: mmc: atmel-mci: stop using specific initcall X-Git-Tag: MMI-PSA29.97-13-9~11089^2~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5e0fe89740657116cacf9c40c93a3676536d31fb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git mmc: atmel-mci: stop using specific initcall No more use late initcall to manage probing order. Use probe deferring if needed. Signed-off-by: Ludovic Desroches Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index f16d019edb51..00f60886c1e5 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -2565,6 +2565,7 @@ static const struct dev_pm_ops atmci_dev_pm_ops = { }; static struct platform_driver atmci_driver = { + .probe = atmci_probe, .remove = atmci_remove, .driver = { .name = "atmel_mci", @@ -2572,19 +2573,7 @@ static struct platform_driver atmci_driver = { .pm = &atmci_dev_pm_ops, }, }; - -static int __init atmci_init(void) -{ - return platform_driver_probe(&atmci_driver, atmci_probe); -} - -static void __exit atmci_exit(void) -{ - platform_driver_unregister(&atmci_driver); -} - -late_initcall(atmci_init); /* try to load after dma driver when built-in */ -module_exit(atmci_exit); +module_platform_driver(atmci_driver); MODULE_DESCRIPTION("Atmel Multimedia Card Interface driver"); MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");