aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/ds.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-01-15 10:26:00 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 10:15:56 -0500
commita78f4dd331a4f6a396eb5849656a4a72a70a56d7 (patch)
tree6dbd9cc08ec80ace397d69ddd6e6f59b575639b4 /drivers/pcmcia/ds.c
parent70294b468302fd7a0a99dad935c7ba5322989345 (diff)
[PATCH] pcmcia: rename pcmcia_device.state
Rename pcmcia_device.state (which is used in very few places) to p_state in order to avoid a namespace collision when moving the deprecated dev_link_t into struct pcmcia_device Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/ds.c')
-rw-r--r--drivers/pcmcia/ds.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index ec2d4166a2e3..488448a12b2f 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -390,7 +390,7 @@ static int pcmcia_device_probe(struct device * dev)
390 goto put_dev; 390 goto put_dev;
391 } 391 }
392 392
393 p_dev->state &= ~CLIENT_UNBOUND; 393 p_dev->p_state &= ~CLIENT_UNBOUND;
394 394
395 ret = p_drv->probe(p_dev); 395 ret = p_drv->probe(p_dev);
396 if (ret) 396 if (ret)
@@ -433,17 +433,17 @@ static int pcmcia_device_remove(struct device * dev)
433 p_drv->remove(p_dev); 433 p_drv->remove(p_dev);
434 434
435 /* check for proper unloading */ 435 /* check for proper unloading */
436 if (p_dev->state & (CLIENT_IRQ_REQ|CLIENT_IO_REQ|CLIENT_CONFIG_LOCKED)) 436 if (p_dev->p_state & (CLIENT_IRQ_REQ|CLIENT_IO_REQ|CLIENT_CONFIG_LOCKED))
437 printk(KERN_INFO "pcmcia: driver %s did not release config properly\n", 437 printk(KERN_INFO "pcmcia: driver %s did not release config properly\n",
438 p_drv->drv.name); 438 p_drv->drv.name);
439 439
440 for (i = 0; i < MAX_WIN; i++) 440 for (i = 0; i < MAX_WIN; i++)
441 if (p_dev->state & CLIENT_WIN_REQ(i)) 441 if (p_dev->p_state & CLIENT_WIN_REQ(i))
442 printk(KERN_INFO "pcmcia: driver %s did not release windows properly\n", 442 printk(KERN_INFO "pcmcia: driver %s did not release windows properly\n",
443 p_drv->drv.name); 443 p_drv->drv.name);
444 444
445 /* references from pcmcia_probe_device */ 445 /* references from pcmcia_probe_device */
446 p_dev->state = CLIENT_UNBOUND; 446 p_dev->p_state = CLIENT_UNBOUND;
447 pcmcia_put_dev(p_dev); 447 pcmcia_put_dev(p_dev);
448 module_put(p_drv->owner); 448 module_put(p_drv->owner);
449 449
@@ -472,7 +472,7 @@ static void pcmcia_card_remove(struct pcmcia_socket *s)
472 } 472 }
473 p_dev = list_entry((&s->devices_list)->next, struct pcmcia_device, socket_device_list); 473 p_dev = list_entry((&s->devices_list)->next, struct pcmcia_device, socket_device_list);
474 list_del(&p_dev->socket_device_list); 474 list_del(&p_dev->socket_device_list);
475 p_dev->state |= CLIENT_STALE; 475 p_dev->p_state |= CLIENT_STALE;
476 spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); 476 spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
477 477
478 device_unregister(&p_dev->dev); 478 device_unregister(&p_dev->dev);
@@ -602,7 +602,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
602 sprintf (p_dev->devname, "pcmcia%s", p_dev->dev.bus_id); 602 sprintf (p_dev->devname, "pcmcia%s", p_dev->dev.bus_id);
603 603
604 /* compat */ 604 /* compat */
605 p_dev->state = CLIENT_UNBOUND; 605 p_dev->p_state = CLIENT_UNBOUND;
606 606
607 607
608 spin_lock_irqsave(&pcmcia_dev_list_lock, flags); 608 spin_lock_irqsave(&pcmcia_dev_list_lock, flags);