more CardServices() removals (drivers/net/wireless)
PATCH 6/7 more CardServices() removals (drivers/net/wireless)
Part 6 of 7.
Revision: linux--mainline--2.6--patch-35
Archive: [email protected]
Creator: Andres Salomon <[email protected]>
Date: Tue Dec 23 19:09:21 EST 2003
Standard-date: 2003-12-24 00:09:21 GMT
Modified-files: drivers/net/wireless/wl3501_cs.c
New-patches: [email protected]/linux--mainline--2.6--patch-35
Summary: CardServices() removal, act 2, pt. 6.
Keywords:
Remove calls to CardServices(), act 2, part 6; wl3501_cs.c.
* added files
{arch}/linux/linux--mainline/linux--mainline--2.6/[email protected]/patch-log/patch-35* modified files
drivers/net/wireless/wl3501_cs.c +15 -16
@@ -1586,7 +1586,7 @@/* Break the link with Card Services */ if (link->handle) -CardServices (DeregisterClient, link->handle); +pcmcia_deregister_client (link->handle);/* Unlink device structure, free pieces */ *linkp = link->next;
@@ -2083,7 +2083,7 @@ client_reg.event_handler = wl3501_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_error (link->handle, RegisterClient, ret);wl3501_detach (link);
@@ -2097,8 +2097,8 @@ goto out; } -#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)/** * wl3501_config - configure the PCMCIA socket and make eth device available
@@ -2121,12 +2121,12 @@/* This reads the card's CONFIG tuple to find its config registers. */ tuple.Attributes =0 ; tuple.DesiredTuple =CISTPL_CONFIG ; -CS_CHECK (GetFirstTuple, handle, &tuple); +CS_CHECK (GetFirstTuple,pcmcia_get_first_tuple (handle, &tuple)); tuple.TupleData = bf; tuple.TupleDataMax =sizeof (bf); 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 ];
@@ -2142,7 +2142,7 @@* 0x200-0x2ff, and so on, because this seems safer */ link->io.BasePort1 = j; link->io.BasePort2 = link->io.BasePort1 +0x10 ; - i =CardServices (RequestIO, link->handle, &link->io); + i =pcmcia_request_io (link->handle, &link->io);if (i ==CS_SUCCESS )break ; }
@@ -2154,12 +2154,12 @@/* Now allocate an interrupt line. Note that this does not actually * assign a handler to the interrupt. */ -CS_CHECK (RequestIRQ, link->handle, &link->irq); +CS_CHECK (RequestIRQ,pcmcia_request_irq (link->handle, &link->irq));/* This actually configures the PCMCIA socket -- setting up the I/O * windows and the interrupt mapping. */ -CS_CHECK (RequestConfiguration, link->handle, &link->conf); +CS_CHECK (RequestConfiguration,pcmcia_request_configuration (link->handle, &link->conf)); dev->irq = link->irq.AssignedIRQ; dev->base_addr = link->io.BasePort1;
@@ -2249,9 +2249,9 @@ }/* Don't bother checking to see if these succeed or not */ -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 ;if (link->state &DEV_STALE_CONFIG )
@@ -2301,7 +2301,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 :
@@ -2310,8 +2310,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) {wl3501_reset (dev);netif_device_attach (dev);