aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/csr/sdio_mmc.c43
1 files changed, 20 insertions, 23 deletions
diff --git a/drivers/staging/csr/sdio_mmc.c b/drivers/staging/csr/sdio_mmc.c
index d3fd57cdde0..b203d2b9513 100644
--- a/drivers/staging/csr/sdio_mmc.c
+++ b/drivers/staging/csr/sdio_mmc.c
@@ -845,19 +845,18 @@ uf_glue_sdio_int_handler(struct sdio_func *func)
845 * Status of the removal. 845 * Status of the removal.
846 * --------------------------------------------------------------------------- 846 * ---------------------------------------------------------------------------
847 */ 847 */
848int 848int csr_sdio_linux_remove_irq(CsrSdioFunction *function)
849csr_sdio_linux_remove_irq(CsrSdioFunction *function)
850{ 849{
851 struct sdio_func *func = (struct sdio_func *)function->priv; 850 struct sdio_func *func = (struct sdio_func *)function->priv;
852 int r; 851 int r;
853 852
854 unifi_trace(NULL, UDBG1, "csr_sdio_linux_remove_irq\n"); 853 unifi_trace(NULL, UDBG1, "csr_sdio_linux_remove_irq\n");
855 854
856 sdio_claim_host(func); 855 sdio_claim_host(func);
857 r = sdio_release_irq(func); 856 r = sdio_release_irq(func);
858 sdio_release_host(func); 857 sdio_release_host(func);
859 858
860 return r; 859 return r;
861 860
862} /* csr_sdio_linux_remove_irq() */ 861} /* csr_sdio_linux_remove_irq() */
863 862
@@ -876,25 +875,23 @@ csr_sdio_linux_remove_irq(CsrSdioFunction *function)
876 * Status of the removal. 875 * Status of the removal.
877 * --------------------------------------------------------------------------- 876 * ---------------------------------------------------------------------------
878 */ 877 */
879int 878int csr_sdio_linux_install_irq(CsrSdioFunction *function)
880csr_sdio_linux_install_irq(CsrSdioFunction *function)
881{ 879{
882 struct sdio_func *func = (struct sdio_func *)function->priv; 880 struct sdio_func *func = (struct sdio_func *)function->priv;
883 int r; 881 int r;
884 882
885 unifi_trace(NULL, UDBG1, "csr_sdio_linux_install_irq\n"); 883 unifi_trace(NULL, UDBG1, "csr_sdio_linux_install_irq\n");
886 884
887 /* Register our interrupt handle */ 885 /* Register our interrupt handle */
888 sdio_claim_host(func); 886 sdio_claim_host(func);
889 r = sdio_claim_irq(func, uf_glue_sdio_int_handler); 887 r = sdio_claim_irq(func, uf_glue_sdio_int_handler);
890 sdio_release_host(func); 888 sdio_release_host(func);
891 889
892 /* If the interrupt was installed earlier, is fine */ 890 /* If the interrupt was installed earlier, is fine */
893 if (r == -EBUSY) { 891 if (r == -EBUSY)
894 r = 0; 892 r = 0;
895 }
896 893
897 return r; 894 return r;
898} /* csr_sdio_linux_install_irq() */ 895} /* csr_sdio_linux_install_irq() */
899 896
900#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) 897#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)