diff options
Diffstat (limited to 'drivers/mmc/host/tifm_sd.c')
-rw-r--r-- | drivers/mmc/host/tifm_sd.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c index 7511f961c67b..8b736e968447 100644 --- a/drivers/mmc/host/tifm_sd.c +++ b/drivers/mmc/host/tifm_sd.c | |||
@@ -1021,10 +1021,6 @@ static void tifm_sd_remove(struct tifm_dev *sock) | |||
1021 | mmc_remove_host(mmc); | 1021 | mmc_remove_host(mmc); |
1022 | dev_dbg(&sock->dev, "after remove\n"); | 1022 | dev_dbg(&sock->dev, "after remove\n"); |
1023 | 1023 | ||
1024 | /* The meaning of the bit majority in this constant is unknown. */ | ||
1025 | writel(0xfff8 & readl(sock->addr + SOCK_CONTROL), | ||
1026 | sock->addr + SOCK_CONTROL); | ||
1027 | |||
1028 | mmc_free_host(mmc); | 1024 | mmc_free_host(mmc); |
1029 | } | 1025 | } |
1030 | 1026 | ||
@@ -1032,14 +1028,7 @@ static void tifm_sd_remove(struct tifm_dev *sock) | |||
1032 | 1028 | ||
1033 | static int tifm_sd_suspend(struct tifm_dev *sock, pm_message_t state) | 1029 | static int tifm_sd_suspend(struct tifm_dev *sock, pm_message_t state) |
1034 | { | 1030 | { |
1035 | struct mmc_host *mmc = tifm_get_drvdata(sock); | 1031 | return mmc_suspend_host(tifm_get_drvdata(sock), state); |
1036 | int rc; | ||
1037 | |||
1038 | rc = mmc_suspend_host(mmc, state); | ||
1039 | /* The meaning of the bit majority in this constant is unknown. */ | ||
1040 | writel(0xfff8 & readl(sock->addr + SOCK_CONTROL), | ||
1041 | sock->addr + SOCK_CONTROL); | ||
1042 | return rc; | ||
1043 | } | 1032 | } |
1044 | 1033 | ||
1045 | static int tifm_sd_resume(struct tifm_dev *sock) | 1034 | static int tifm_sd_resume(struct tifm_dev *sock) |