[PATCH] pcmcia: convert remaining users of pcmcia_release_io and _irq

Convert the remaining drivers which use pcmcia_release_io or
pcmcia_release_irq, and remove the EXPORT of these symbols.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

3 files changed, 11 insertions, 15 deletions

diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index f3889bdc8e43..5f70661994d8 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -284,25 +284,25 @@ found_port:
             cs_error(link->handle, RequestIO, i);
             break;
         }
-        
+
         /*
          * allocate an interrupt line
          */
         i = pcmcia_request_irq(link->handle, &link->irq);
         if (i != CS_SUCCESS) {
             cs_error(link->handle, RequestIRQ, i);
-            pcmcia_release_io(link->handle, &link->io);
+            /* undo */
+            pcmcia_disable_device(link->handle);
             break;
         }
-        
+
         /*
          * configure the PCMCIA socket
           */
         i = pcmcia_request_configuration(link->handle, &link->conf);
         if (i != CS_SUCCESS) {
             cs_error(link->handle, RequestConfiguration, i);
-            pcmcia_release_io(link->handle, &link->io);
-            pcmcia_release_irq(link->handle, &link->irq);
+            pcmcia_disable_device(link->handle);
             break;
         }
 
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 729c2de0bc1d..845fa14e1bae 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -313,18 +313,18 @@ found_port:
         i = pcmcia_request_irq(link->handle, &link->irq);
         if (i != CS_SUCCESS) {
             cs_error(link->handle, RequestIRQ, i);
-            pcmcia_release_io(link->handle, &link->io);
+            /* undo */
+            pcmcia_disable_device(link->handle);
             break;
         }
-        
+
         /*
          * configure the PCMCIA socket
          */
         i = pcmcia_request_configuration(link->handle, &link->conf);
         if (i != CS_SUCCESS) {
             cs_error(link->handle, RequestConfiguration, i);
-            pcmcia_release_io(link->handle, &link->io);
-            pcmcia_release_irq(link->handle, &link->irq);
+            pcmcia_disable_device(link->handle);
             break;
         }
 
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index e59539157d19..fd0f127e40ba 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -374,15 +374,11 @@ static void sedlbauer_config(dev_link_t *link)
         }
         /* If we got this far, we're cool! */
         break;
-        
+
     next_entry:
-/* new in dummy.cs 2001/01/28 MN 
-        if (link->io.NumPorts1)
-           pcmcia_release_io(link->handle, &link->io);
-*/
         CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
     }
-    
+
     /*
        Allocate an interrupt line.  Note that this does not assign a
        handler to the interrupt, unless the 'Handler' member of the