From 180817360c75313ffa0bc70f823482ec222ccc59 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 3 Oct 2012 16:26:37 +0300 Subject: [PATCH] --- yaml --- r: 336271 b: refs/heads/master c: 49480cf2c29ffd2b6cb5213eaf8995bd1e16a345 h: refs/heads/master i: 336269: 0feb3c2cf649e530ddd22ee049644663cf50f721 336267: e569b3d71e2f3d5778a3257eb890851a03be2d8c 336263: 2e0ed143a49a45c92fc38d125480470c9998d1ce 336255: 0b2052c119b0e26f20eb4b049edc8d626f485bc2 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/dw_mmc-pltfm.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 7ceeb5900a98..839b4c5173bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c4f87fb751d20ee2cd530861de38af62f6161d4 +refs/heads/master: 49480cf2c29ffd2b6cb5213eaf8995bd1e16a345 diff --git a/trunk/drivers/mmc/host/dw_mmc-pltfm.c b/trunk/drivers/mmc/host/dw_mmc-pltfm.c index c1115df9e72c..4e133709e33d 100644 --- a/trunk/drivers/mmc/host/dw_mmc-pltfm.c +++ b/trunk/drivers/mmc/host/dw_mmc-pltfm.c @@ -119,6 +119,7 @@ static const struct of_device_id dw_mci_pltfm_match[] = { MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match); static struct platform_driver dw_mci_pltfm_driver = { + .probe = dw_mci_pltfm_probe, .remove = __devexit_p(dw_mci_pltfm_remove), .driver = { .name = "dw_mmc", @@ -127,18 +128,7 @@ static struct platform_driver dw_mci_pltfm_driver = { }, }; -static int __init dw_mci_init(void) -{ - return platform_driver_probe(&dw_mci_pltfm_driver, dw_mci_pltfm_probe); -} - -static void __exit dw_mci_exit(void) -{ - platform_driver_unregister(&dw_mci_pltfm_driver); -} - -module_init(dw_mci_init); -module_exit(dw_mci_exit); +module_platform_driver(dw_mci_pltfm_driver); MODULE_DESCRIPTION("DW Multimedia Card Interface driver"); MODULE_AUTHOR("NXP Semiconductor VietNam");