CardServices() removal from pcmcia net drivers
PATCH 6/10 CardServices() removal from pcmcia net drivers
Part 6 of 10.
Revision: linux--mainline--2.6--patch-19
Archive: [email protected]
Creator: Andres Salomon <[email protected]>
Date: Sun Dec 21 21:27:45 EST 2003
Standard-date: 2003-12-22 02:27:45 GMT
Modified-files: drivers/net/pcmcia/3c589_cs.c
New-patches: [email protected]/linux--mainline--2.6--patch-19
Summary: CardServices() removal, pt. 6
Keywords:
Remove calls to CardServices(), part 6; 3c589_cs.c.
* added files
{arch}/linux/linux--mainline/linux--mainline--2.6/[email protected]/patch-log/patch-19* modified files
drivers/net/pcmcia/3c589_cs.c +19 -19
@@ -244,7 +244,7 @@ client_reg.event_handler = &tc589_event; client_reg.Version =0x0210 ; client_reg.event_callback_args.client_data = link; - ret =CardServices (RegisterClient, &link->handle, &client_reg); + ret =pcmcia_register_client (&link->handle, &client_reg);if (ret !=0 ) {cs_error (link->handle, RegisterClient, ret);tc589_detach (link);
@@ -283,7 +283,7 @@ }if (link->handle) -CardServices (DeregisterClient, link->handle); +pcmcia_deregister_client (link->handle);/* Unlink device structure, free bits */ *linkp = link->next;
@@ -303,8 +303,8 @@======================================================================*/ -#define CS_CHECK(fn, args...) \ -while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed +#define CS_CHECK (fn, ret) \ +do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)static void tc589_config (dev_link_t *link) {
@@ -323,20 +323,20 @@ phys_addr = (u16 *)dev->dev_addr; tuple.Attributes =0 ; tuple.DesiredTuple =CISTPL_CONFIG ; -CS_CHECK (GetFirstTuple, handle, &tuple); +CS_CHECK (GetFirstTuple,pcmcia_get_first_tuple (handle, &tuple)); tuple.TupleData = (cisdata_t *)buf; tuple.TupleDataMax =sizeof (buf); tuple.TupleOffset =0 ; -CS_CHECK (GetTupleData, handle, &tuple); -CS_CHECK (ParseTuple, handle, &tuple, &parse); +CS_CHECK (GetTupleData,pcmcia_get_tuple_data (handle, &tuple)); +CS_CHECK (ParseTuple,pcmcia_parse_tuple (handle, &tuple, &parse)); link->conf.ConfigBase = parse.config.base; link->conf.Present = parse.config.rmask[0 ];/* Is this a 3c562? */ tuple.DesiredTuple =CISTPL_MANFID ; tuple.Attributes =TUPLE_RETURN_COMMON ; -if ((CardServices (GetFirstTuple, handle, &tuple) ==CS_SUCCESS ) && - (CardServices (GetTupleData, handle, &tuple) ==CS_SUCCESS )) { +if ((pcmcia_get_first_tuple (handle, &tuple) ==CS_SUCCESS ) && + (pcmcia_get_tuple_data (handle, &tuple) ==CS_SUCCESS )) {if (le16_to_cpu (buf[0 ]) !=MANFID_3COM )printk (KERN_INFO "3c589_cs: hmmm, is this really a " "3Com card??\n" );
@@ -351,15 +351,15 @@for (i = j =0 ; j <0x400 ; j +=0x10 ) {if (multi && (j &0x80 ))continue ; link->io.BasePort1 = j ^0x300 ; - i =CardServices (RequestIO, link->handle, &link->io); + i =pcmcia_request_io (link->handle, &link->io);if (i ==CS_SUCCESS )break ; }if (i !=CS_SUCCESS ) {cs_error (link->handle, RequestIO, i); goto failed; } -CS_CHECK (RequestIRQ, link->handle, &link->irq); -CS_CHECK (RequestConfiguration, link->handle, &link->conf); +CS_CHECK (RequestIRQ,pcmcia_request_irq (link->handle, &link->irq)); +CS_CHECK (RequestConfiguration,pcmcia_request_configuration (link->handle, &link->conf)); dev->irq = link->irq.AssignedIRQ; dev->base_addr = link->io.BasePort1;
@@ -374,8 +374,8 @@/* The 3c589 has an extra EEPROM for configuration info, including the hardware address. The 3c562 puts the address in the CIS. */ tuple.DesiredTuple =0x88 ; -if (CardServices (GetFirstTuple, handle, &tuple) ==CS_SUCCESS ) { -CardServices (GetTupleData, handle, &tuple); +if (pcmcia_get_first_tuple (handle, &tuple) ==CS_SUCCESS ) { +pcmcia_get_tuple_data (handle, &tuple);for (i =0 ; i <3 ; i++) phys_addr[i] =htons (buf[i]); }else {
@@ -440,9 +440,9 @@return ; } -CardServices (ReleaseConfiguration, link->handle); -CardServices (ReleaseIO, link->handle, &link->io); -CardServices (ReleaseIRQ, link->handle, &link->irq); +pcmcia_release_configuration (link->handle); +pcmcia_release_io (link->handle, &link->io); +pcmcia_release_irq (link->handle, &link->irq); link->state &= ~DEV_CONFIG ;
@@ -486,7 +486,7 @@if (link->state &DEV_CONFIG ) {if (link->open)netif_device_detach (dev); -CardServices (ReleaseConfiguration, link->handle); +pcmcia_release_configuration (link->handle); }break ;case CS_EVENT_PM_RESUME :
@@ -494,7 +494,7 @@/* Fall through... */ case CS_EVENT_CARD_RESET :if (link->state &DEV_CONFIG ) { -CardServices (RequestConfiguration, link->handle, &link->conf); +pcmcia_request_configuration (link->handle, &link->conf);if (link->open) {tc589_reset (dev);netif_device_attach (dev);