Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50db3fdb authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

[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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 5f2a71fc

Documentation/pcmcia/driver-changes.txt

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ This file details changes in 2.6 which affect PCMCIA card driver authors: 
* New release helper (as of 2.6.17)

   Instead of calling pcmcia_release_{configuration,io,irq,win}, all that's

   necessary now is calling pcmcia_disable_device. As there is no valid

   reason left to call pcmcia_release_io and pcmcia_release_irq, they will

   be removed soon.

   reason left to call pcmcia_release_io and pcmcia_release_irq, the

   exports for them were removed.



* Unify detach and REMOVAL event code, as well as attach and INSERTION

  code (as of 2.6.16)

drivers/isdn/hardware/avm/avm_cs.c

+5 −5
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ static void avmcs_config(dev_link_t *link) 
	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;

	}
@@ -301,8 +302,7 @@ static void avmcs_config(dev_link_t *link) 
	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;

	}

drivers/isdn/hisax/avma1_cs.c

+4 −4
Original line number Diff line number Diff line
@@ -313,7 +313,8 @@ static void avma1cs_config(dev_link_t *link) 
	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;

	}
@@ -323,8 +324,7 @@ static void avma1cs_config(dev_link_t *link) 
	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;

	}

drivers/isdn/hisax/sedlbauer_cs.c

+2 −6
Original line number Diff line number Diff line
@@ -376,10 +376,6 @@ static void sedlbauer_config(dev_link_t *link) 
	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));

    }

drivers/net/pcmcia/smc91c92_cs.c

+8 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <pcmcia/cisreg.h>

#include <pcmcia/ciscode.h>

#include <pcmcia/ds.h>

#include <pcmcia/ss.h>



#include <asm/io.h>

#include <asm/system.h>
@@ -965,10 +966,15 @@ static int check_sig(dev_link_t *link) 


    if (width) {

	printk(KERN_INFO "smc91c92_cs: using 8-bit IO window.\n");

	/* call pcmcia_release_configuration() in _suspend */

	smc91c92_suspend(link->handle);

	pcmcia_release_io(link->handle, &link->io);



	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	pcmcia_request_io(link->handle, &link->io);

	link->handle->socket->io[0].res->flags &= ~IO_DATA_PATH_WIDTH;

	link->handle->socket->io[0].res->flags |= IO_DATA_PATH_WIDTH_8;



	/* call pcmcia_request_configuration() in _resume, it handles the

	 * flag update */

	smc91c92_resume(link->handle);

	return check_sig(link);

    }