diff options
Diffstat (limited to 'drivers/mmc/host/jz4740_mmc.c')
-rw-r--r-- | drivers/mmc/host/jz4740_mmc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index c8852a8128a9..2391c6b7a4bb 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c | |||
@@ -702,7 +702,7 @@ static const struct jz_gpio_bulk_request jz4740_mmc_pins[] = { | |||
702 | JZ_GPIO_BULK_PIN(MSC_DATA3), | 702 | JZ_GPIO_BULK_PIN(MSC_DATA3), |
703 | }; | 703 | }; |
704 | 704 | ||
705 | static int __devinit jz4740_mmc_request_gpio(struct device *dev, int gpio, | 705 | static int jz4740_mmc_request_gpio(struct device *dev, int gpio, |
706 | const char *name, bool output, int value) | 706 | const char *name, bool output, int value) |
707 | { | 707 | { |
708 | int ret; | 708 | int ret; |
@@ -724,7 +724,7 @@ static int __devinit jz4740_mmc_request_gpio(struct device *dev, int gpio, | |||
724 | return 0; | 724 | return 0; |
725 | } | 725 | } |
726 | 726 | ||
727 | static int __devinit jz4740_mmc_request_gpios(struct platform_device *pdev) | 727 | static int jz4740_mmc_request_gpios(struct platform_device *pdev) |
728 | { | 728 | { |
729 | int ret; | 729 | int ret; |
730 | struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data; | 730 | struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data; |
@@ -759,7 +759,7 @@ err: | |||
759 | return ret; | 759 | return ret; |
760 | } | 760 | } |
761 | 761 | ||
762 | static int __devinit jz4740_mmc_request_cd_irq(struct platform_device *pdev, | 762 | static int jz4740_mmc_request_cd_irq(struct platform_device *pdev, |
763 | struct jz4740_mmc_host *host) | 763 | struct jz4740_mmc_host *host) |
764 | { | 764 | { |
765 | struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data; | 765 | struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data; |
@@ -802,7 +802,7 @@ static inline size_t jz4740_mmc_num_pins(struct jz4740_mmc_host *host) | |||
802 | return num_pins; | 802 | return num_pins; |
803 | } | 803 | } |
804 | 804 | ||
805 | static int __devinit jz4740_mmc_probe(struct platform_device* pdev) | 805 | static int jz4740_mmc_probe(struct platform_device* pdev) |
806 | { | 806 | { |
807 | int ret; | 807 | int ret; |
808 | struct mmc_host *mmc; | 808 | struct mmc_host *mmc; |
@@ -938,7 +938,7 @@ err_free_host: | |||
938 | return ret; | 938 | return ret; |
939 | } | 939 | } |
940 | 940 | ||
941 | static int __devexit jz4740_mmc_remove(struct platform_device *pdev) | 941 | static int jz4740_mmc_remove(struct platform_device *pdev) |
942 | { | 942 | { |
943 | struct jz4740_mmc_host *host = platform_get_drvdata(pdev); | 943 | struct jz4740_mmc_host *host = platform_get_drvdata(pdev); |
944 | 944 | ||
@@ -1004,7 +1004,7 @@ const struct dev_pm_ops jz4740_mmc_pm_ops = { | |||
1004 | 1004 | ||
1005 | static struct platform_driver jz4740_mmc_driver = { | 1005 | static struct platform_driver jz4740_mmc_driver = { |
1006 | .probe = jz4740_mmc_probe, | 1006 | .probe = jz4740_mmc_probe, |
1007 | .remove = __devexit_p(jz4740_mmc_remove), | 1007 | .remove = jz4740_mmc_remove, |
1008 | .driver = { | 1008 | .driver = { |
1009 | .name = "jz4740-mmc", | 1009 | .name = "jz4740-mmc", |
1010 | .owner = THIS_MODULE, | 1010 | .owner = THIS_MODULE, |