CardServices() removal from pcmcia net drivers
PATCH 7/10 CardServices() removal from pcmcia net drivers
Part 7 of 10.
Revision: linux--mainline--2.6--patch-20
Archive: [email protected]
Creator: Andres Salomon <[email protected]>
Date: Sun Dec 21 21:44:13 EST 2003
Standard-date: 2003-12-22 02:44:13 GMT
Modified-files: drivers/net/pcmcia/axnet_cs.c
New-patches: [email protected]/linux--mainline--2.6--patch-20
Summary: CardServices() removal, pt. 7
Keywords:
Remove calls to CardServices(), part 7; axnet_cs.c.
* added files
{arch}/linux/linux--mainline/linux--mainline--2.6/[email protected]/patch-log/patch-20* modified files
drivers/net/pcmcia/axnet_cs.c +23 -26
@@ -205,7 +205,7 @@ client_reg.event_handler = &axnet_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 !=CS_SUCCESS ) {cs_error (link->handle, RegisterClient, ret);axnet_detach (link);
@@ -244,7 +244,7 @@ }if (link->handle) -CardServices (DeregisterClient, link->handle); +pcmcia_deregister_client (link->handle);/* Unlink device structure, free bits */ *linkp = link->next;
@@ -313,11 +313,8 @@======================================================================*/ -#define CS_CHECK(fn, args...) \ -while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed - -#define CFG_CHECK(fn, args...) \ -if (CardServices(fn, args) != 0) goto next_entry +#define CS_CHECK (fn, ret) \ +do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)static int try_io_port (dev_link_t *link) {
@@ -340,12 +337,12 @@for (j =0 ; j <0x400 ; j +=0x20 ) { link->io.BasePort1 = j ^0x300 ; link->io.BasePort2 = (j ^0x300 ) +0x10 ; - ret =CardServices (RequestIO, link->handle, &link->io); + ret =pcmcia_request_io (link->handle, &link->io);if (ret ==CS_SUCCESS )return ret; }return ret; }else { -return CardServices (RequestIO, link->handle, &link->io); +return pcmcia_request_io (link->handle, &link->io); } }
@@ -367,9 +364,9 @@ tuple.TupleDataMax =sizeof (buf); tuple.TupleOffset =0 ; tuple.DesiredTuple =CISTPL_CONFIG ; -CS_CHECK (GetFirstTuple, handle, &tuple); -CS_CHECK (GetTupleData, handle, &tuple); -CS_CHECK (ParseTuple, handle, &tuple, &parse); +CS_CHECK (GetFirstTuple,pcmcia_get_first_tuple (handle, &tuple)); +CS_CHECK (GetTupleData,pcmcia_get_tuple_data (handle, &tuple)); +CS_CHECK (ParseTuple,pcmcia_parse_tuple (handle, &tuple, &parse)); link->conf.ConfigBase = parse.config.base;/* don't trust the CIS on this; Linksys got it wrong */ link->conf.Present =0x63 ;
@@ -378,19 +375,19 @@ link->state |=DEV_CONFIG ;/* Look up current Vcc */ -CS_CHECK (GetConfigurationInfo, handle, &conf); +CS_CHECK (GetConfigurationInfo,pcmcia_get_configuration_info (handle, &conf)); link->conf.Vcc = conf.Vcc; tuple.DesiredTuple =CISTPL_CFTABLE_ENTRY ; tuple.Attributes =0 ; -CS_CHECK (GetFirstTuple, handle, &tuple); +CS_CHECK (GetFirstTuple,pcmcia_get_first_tuple (handle, &tuple));while (last_ret ==CS_SUCCESS ) {cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);cistpl_io_t *io = &(parse.cftable_entry.io); -CFG_CHECK (GetTupleData, handle, &tuple); -CFG_CHECK (ParseTuple, handle, &tuple, &parse); -if ((cfg->index ==0 ) || (cfg->io.nwin ==0 )) +if (pcmcia_get_tuple_data (handle, &tuple) !=0 || +pcmcia_parse_tuple (handle, &tuple, &parse) !=0 || + cfg->index ==0 || cfg->io.nwin ==0 ) goto next_entry; link->conf.ConfigIndex =0x05 ;
@@ -411,21 +408,21 @@if (last_ret ==CS_SUCCESS )break ; } next_entry: - last_ret =CardServices (GetNextTuple, handle, &tuple); + last_ret =pcmcia_get_next_tuple (handle, &tuple); }if (last_ret !=CS_SUCCESS ) {cs_error (handle, RequestIO, last_ret); goto failed; } -CS_CHECK (RequestIRQ, handle, &link->irq); +CS_CHECK (RequestIRQ,pcmcia_request_irq (handle, &link->irq));if (link->io.NumPorts2 ==8 ) { link->conf.Attributes |=CONF_ENABLE_SPKR ; link->conf.Status =CCSR_AUDIO_ENA ; } -CS_CHECK (RequestConfiguration, handle, &link->conf); +CS_CHECK (RequestConfiguration,pcmcia_request_configuration (handle, &link->conf)); dev->irq = link->irq.AssignedIRQ; dev->base_addr = link->io.BasePort1;if (register_netdev (dev) !=0 ) {
@@ -476,7 +473,7 @@Bit 2 of CCSR is active low. */ if (i ==32 ) {conf_reg_t reg = {0 ,CS_WRITE ,CISREG_CCSR ,0x04 }; -CardServices (AccessConfigurationRegister, link->handle, ®); +pcmcia_access_configuration_register (link->handle, ®);for (i =0 ; i <32 ; i++) { j =mdio_read (dev->base_addr +AXNET_MII_EEP , i,1 );if ((j !=0 ) && (j !=0xffff ))break ;
@@ -520,9 +517,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 ;
@@ -566,7 +563,7 @@if (link->state &DEV_CONFIG ) {if (link->open)netif_device_detach (&info->dev); -CardServices (ReleaseConfiguration, link->handle); +pcmcia_release_configuration (link->handle); }break ;case CS_EVENT_PM_RESUME :
@@ -574,7 +571,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) {axnet_reset_8390 (&info->dev);AX88190_init (&info->dev,1 );