lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] pcmcia: remove unused p_dev->state flags

Browse Source 
Remove the unused DEV_RELEASE_PENDING flag, and move the DEV_SUSPEND flag
into the p_dev structure, and make use of it at the core level.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski
2006-01-20 15:10:23 +01:00
parent b4c884000a
commit f6fbe01ac9
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/atmel_cs.c
View File

@@ -220,7 +220,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
static int card_present(void *arg)
{
struct pcmcia_device *link = (struct pcmcia_device *)arg;
if (link->state & DEV_SUSPEND)
if (link->suspended)
return 0;
else if (link->state & DEV_PRESENT)
return 1;

2
drivers/net/wireless/ray_cs.c
View File

@@ -1968,7 +1968,7 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id, struct pt_regs * regs)
local = (ray_dev_t *)dev->priv;
link = (struct pcmcia_device *)local->finder;
if ( ! (link->state & DEV_PRESENT) || link->state & DEV_SUSPEND ) {
if ( ! (link->state & DEV_PRESENT) || link->suspended ) {
DEBUG(2,"ray_cs interrupt from device not present or suspended.\n");
return IRQ_NONE;
}

1
drivers/net/wireless/wavelan_cs.c
View File

@@ -4744,7 +4744,6 @@ static int wavelan_resume(struct pcmcia_device *link)
{
struct net_device * dev = (struct net_device *) link->priv;
link->state &= ~DEV_SUSPEND;
if ((link->state & DEV_CONFIG) && (link->open)) {
wv_hw_reset(dev);
netif_device_attach(dev);