[PATCH] pcmcia: use bitfield instead of p_state and state

[deliverable/linux.git] / sound / pcmcia / vx / vxpocket.c

diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index 4004b35e8af5facb4c6e9af4624ea526ba31d5c5..f5f4a577a44131716db70d246fb54a3cff829ec8 100644 (file)
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -249,9 +249,6 @@ static int vxpocket_config(struct pcmcia_device *link)
                strcpy(chip->card->driver, vxp440_hw.name);
        }
 
-       /* Configure card */
-       link->state |= DEV_CONFIG;
-
        CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
        CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
@@ -263,7 +260,6 @@ static int vxpocket_config(struct pcmcia_device *link)
                goto failed;
 
        link->dev_node = &vxp->node;
-       link->state &= ~DEV_CONFIG_PENDING;
        kfree(parse);
        return 9;
 
@@ -348,7 +344,6 @@ static int vxpocket_probe(struct pcmcia_device *p_dev)
        card_alloc |= 1 << i;
 
        vxp->p_dev = p_dev;
-       vxp->p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
 
        return vxpocket_config(p_dev);
 }