mmc: davinci: dont' use module_platform_driver_probe()
PATCH 1/1 mmc: davinci: dont' use module_platform_driver_probe()
This changes module_platform_driver_probe() to module_platform_driver() in the TI DaVinci MMC driver.
On device tree systems, we can get a -EPROBE_DEFER when using a pinmux for the CD GPIO, which results in the driver never loading because module_platform_driver_probe() prevents it from being re-probed.
So, we replace module_platform_driver_probe() with module_platform_driver() and removed the __init attributes accordingly.
--- drivers/mmc/host/davinci_mmc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mmc/host/davinci_mmc.c +6 -6
@@ -174,7 +174,7 @@ module_param(poll_loopcount, uint, S_IRUGO);MODULE_PARM_DESC (poll_loopcount,"Maximum polling loop count. Default = 32" ); -static unsigned __initdata use_dma =1 ; +static unsigned use_dma =1 ;module_param (use_dma, uint,0 );MODULE_PARM_DESC (use_dma,"Whether to use DMA or not. Default = 1" );
@@ -496,8 +496,7 @@ static int mmc_davinci_start_dma_transfer(struct mmc_davinci_host *host,return ret; } -static void __init_or_module -davinci_release_dma_channels (struct mmc_davinci_host *host) +static void davinci_release_dma_channels (struct mmc_davinci_host *host) {if (!host->use_dma)return ;
@@ -506,7 +505,7 @@ davinci_release_dma_channels(struct mmc_davinci_host *host)dma_release_channel (host->dma_rx); } -static int __init davinci_acquire_dma_channels (struct mmc_davinci_host *host) +static int davinci_acquire_dma_channels (struct mmc_davinci_host *host) { host->dma_tx =dma_request_chan (mmc_dev (host->mmc),"tx" );if (IS_ERR (host->dma_tx)) {
@@ -1201,7 +1200,7 @@ static int mmc_davinci_parse_pdata(struct mmc_host *mmc)return 0 ; } -static int __init davinci_mmcsd_probe (struct platform_device *pdev) +static int davinci_mmcsd_probe (struct platform_device *pdev) {const struct of_device_id *match;struct mmc_davinci_host *host =NULL ;
@@ -1414,11 +1413,12 @@ static struct platform_driver davinci_mmcsd_driver = { .pm = davinci_mmcsd_pm_ops, .of_match_table = davinci_mmc_dt_ids, }, + .probe = davinci_mmcsd_probe, .remove = __exit_p(davinci_mmcsd_remove), .id_table = davinci_mmc_devtype, }; -module_platform_driver_probe (davinci_mmcsd_driver, davinci_mmcsd_probe); +module_platform_driver (davinci_mmcsd_driver);MODULE_AUTHOR ("Texas Instruments India" );MODULE_LICENSE ("GPL" );
Signature · 1 line
2.7.4
Ulf Hansson
AppliedQuoted 7 lines · David Lechner
This changes
module_platform_driver_probe()tomodule_platform_driver()in the TI DaVinci MMC driver.On device tree systems, we can get a -EPROBE_DEFER when using a pinmux for the CD GPIO, which results in the driver never loading because
module_platform_driver_probe()prevents it from being re-probed.
Quoted 5 lines
So, we replace
module_platform_driver_probe()withmodule_platform_driver()and removed the__initattributes accordingly.Cc Ulf Hansson <[email protected]>Signed-off-by David Lechner <[email protected]>
Thanks, applied for next!
Kind regards
Uffe
Quoted 62 lines
--- drivers/mmc/host/davinci_mmc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/mmc/host/davinci_mmc.c +6
-7@@ -174,7 +174,7 @@ module_param(poll_loopcount, uint, S_IRUGO);MODULE_PARM_DESC (poll_loopcount,"Maximum polling loop count. Default = 32" ); -static unsigned __initdata use_dma =1 ; +static unsigned use_dma =1 ;module_param (use_dma, uint,0 );MODULE_PARM_DESC (use_dma,"Whether to use DMA or not. Default = 1" );@@ -496,8 +496,7 @@ static int mmc_davinci_start_dma_transfer(struct mmc_davinci_host *host,return ret; } -static void __init_or_module -davinci_release_dma_channels (struct mmc_davinci_host *host) +static void davinci_release_dma_channels (struct mmc_davinci_host *host) {if (!host->use_dma)return ;@@ -506,7 +505,7 @@ davinci_release_dma_channels(struct mmc_davinci_host *host)dma_release_channel (host->dma_rx); } -static int __init davinci_acquire_dma_channels (struct mmc_davinci_host *host) +static int davinci_acquire_dma_channels (struct mmc_davinci_host *host) { host->dma_tx =dma_request_chan (mmc_dev (host->mmc),"tx" );if (IS_ERR (host->dma_tx)) {@@ -1201,7 +1200,7 @@ static int mmc_davinci_parse_pdata(struct mmc_host *mmc)return 0 ; } -static int __init davinci_mmcsd_probe (struct platform_device *pdev) +static int davinci_mmcsd_probe (struct platform_device *pdev) {const struct of_device_id *match;struct mmc_davinci_host *host =NULL ;@@ -1414,11 +1413,12 @@ static struct platform_driver davinci_mmcsd_driver = { .pm = davinci_mmcsd_pm_ops, .of_match_table = davinci_mmc_dt_ids, }, + .probe = davinci_mmcsd_probe, .remove = __exit_p(davinci_mmcsd_remove), .id_table = davinci_mmc_devtype, }; -module_platform_driver_probe (davinci_mmcsd_driver, davinci_mmcsd_probe); +module_platform_driver (davinci_mmcsd_driver);MODULE_AUTHOR ("Texas Instruments India" );MODULE_LICENSE ("GPL" ); --2.7.4