diff options
Diffstat (limited to 'drivers/staging/csr/sdio_mmc.c')
-rw-r--r-- | drivers/staging/csr/sdio_mmc.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/csr/sdio_mmc.c b/drivers/staging/csr/sdio_mmc.c index 0b90630d332..862edb8934d 100644 --- a/drivers/staging/csr/sdio_mmc.c +++ b/drivers/staging/csr/sdio_mmc.c | |||
@@ -479,7 +479,6 @@ CsrSdioInterruptEnable(CsrSdioFunction *function) | |||
479 | #endif | 479 | #endif |
480 | _sdio_release_host(func); | 480 | _sdio_release_host(func); |
481 | 481 | ||
482 | func_exit(); | ||
483 | if (err) { | 482 | if (err) { |
484 | printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); | 483 | printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); |
485 | return ConvertSdioToCsrSdioResult(err); | 484 | return ConvertSdioToCsrSdioResult(err); |
@@ -506,7 +505,6 @@ CsrSdioInterruptDisable(CsrSdioFunction *function) | |||
506 | #endif | 505 | #endif |
507 | _sdio_release_host(func); | 506 | _sdio_release_host(func); |
508 | 507 | ||
509 | func_exit(); | ||
510 | if (err) { | 508 | if (err) { |
511 | printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); | 509 | printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); |
512 | return ConvertSdioToCsrSdioResult(err); | 510 | return ConvertSdioToCsrSdioResult(err); |
@@ -548,7 +546,6 @@ CsrSdioFunctionEnable(CsrSdioFunction *function) | |||
548 | unifi_error(NULL, "Failed to enable SDIO function %d\n", func->num); | 546 | unifi_error(NULL, "Failed to enable SDIO function %d\n", func->num); |
549 | } | 547 | } |
550 | 548 | ||
551 | func_exit(); | ||
552 | return ConvertSdioToCsrSdioResult(err); | 549 | return ConvertSdioToCsrSdioResult(err); |
553 | } /* CsrSdioFunctionEnable() */ | 550 | } /* CsrSdioFunctionEnable() */ |
554 | 551 | ||
@@ -580,7 +577,6 @@ CsrSdioFunctionDisable(CsrSdioFunction *function) | |||
580 | unifi_error(NULL, "Failed to disable SDIO function %d\n", func->num); | 577 | unifi_error(NULL, "Failed to disable SDIO function %d\n", func->num); |
581 | } | 578 | } |
582 | 579 | ||
583 | func_exit(); | ||
584 | return ConvertSdioToCsrSdioResult(err); | 580 | return ConvertSdioToCsrSdioResult(err); |
585 | } /* CsrSdioFunctionDisable() */ | 581 | } /* CsrSdioFunctionDisable() */ |
586 | 582 | ||
@@ -1096,7 +1092,6 @@ uf_glue_sdio_probe(struct sdio_func *func, | |||
1096 | wake_lock(&unifi_sdio_wake_lock); | 1092 | wake_lock(&unifi_sdio_wake_lock); |
1097 | #endif | 1093 | #endif |
1098 | 1094 | ||
1099 | func_exit(); | ||
1100 | return 0; | 1095 | return 0; |
1101 | } /* uf_glue_sdio_probe() */ | 1096 | } /* uf_glue_sdio_probe() */ |
1102 | 1097 | ||
@@ -1139,8 +1134,6 @@ uf_glue_sdio_remove(struct sdio_func *func) | |||
1139 | 1134 | ||
1140 | kfree(sdio_ctx); | 1135 | kfree(sdio_ctx); |
1141 | 1136 | ||
1142 | func_exit(); | ||
1143 | |||
1144 | } /* uf_glue_sdio_remove */ | 1137 | } /* uf_glue_sdio_remove */ |
1145 | 1138 | ||
1146 | 1139 | ||
@@ -1176,7 +1169,6 @@ uf_glue_sdio_suspend(struct device *dev) | |||
1176 | { | 1169 | { |
1177 | unifi_trace(NULL, UDBG1, "uf_glue_sdio_suspend"); | 1170 | unifi_trace(NULL, UDBG1, "uf_glue_sdio_suspend"); |
1178 | 1171 | ||
1179 | func_exit(); | ||
1180 | return 0; | 1172 | return 0; |
1181 | } /* uf_glue_sdio_suspend */ | 1173 | } /* uf_glue_sdio_suspend */ |
1182 | 1174 | ||
@@ -1204,7 +1196,6 @@ uf_glue_sdio_resume(struct device *dev) | |||
1204 | wake_lock(&unifi_sdio_wake_lock); | 1196 | wake_lock(&unifi_sdio_wake_lock); |
1205 | #endif | 1197 | #endif |
1206 | 1198 | ||
1207 | func_exit(); | ||
1208 | return 0; | 1199 | return 0; |
1209 | 1200 | ||
1210 | } /* uf_glue_sdio_resume */ | 1201 | } /* uf_glue_sdio_resume */ |