leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects 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
Show Stats 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);

48
drivers/pcmcia/ds.c
View File

@ -945,7 +945,7 @@ static ssize_t pcmcia_show_pm_state(struct device *dev, struct device_attribute
{
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
if (p_dev->dev.power.power_state.event != PM_EVENT_ON)
if (p_dev->suspended)
return sprintf(buf, "off\n");
else
return sprintf(buf, "on\n");
@ -960,11 +960,9 @@ static ssize_t pcmcia_store_pm_state(struct device *dev, struct device_attribute
if (!count)
return -EINVAL;
if ((p_dev->dev.power.power_state.event == PM_EVENT_ON) &&
(!strncmp(buf, "off", 3)))
if ((!p_dev->suspended) && !strncmp(buf, "off", 3))
ret = dpm_runtime_suspend(dev, PMSG_SUSPEND);
else if ((p_dev->dev.power.power_state.event != PM_EVENT_ON) &&
(!strncmp(buf, "on", 2)))
else if (p_dev->suspended && !strncmp(buf, "on", 2))
dpm_runtime_resume(dev);
return ret ? ret : count;
@ -1030,7 +1028,7 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
{
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
struct pcmcia_driver *p_drv = NULL;
int ret;
int ret = 0;
if (dev->driver)
p_drv = to_pcmcia_drv(dev->driver);
@ -1038,14 +1036,16 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
if (p_drv && p_drv->suspend) {
ret = p_drv->suspend(p_dev);
if (ret)
return ret;
p_dev->state |= DEV_SUSPEND;
if ((p_dev->state & DEV_CONFIG) &&
!(p_dev->state & DEV_SUSPEND_NORELEASE))
pcmcia_release_configuration(p_dev);
goto out;
if ((p_dev->state & DEV_CONFIG) &&
!(p_dev->state & DEV_SUSPEND_NORELEASE))
pcmcia_release_configuration(p_dev);
}
return 0;
out:
if (!ret)
p_dev->suspended = 1;
return ret;
}
@ -1053,24 +1053,26 @@ static int pcmcia_dev_resume(struct device * dev)
{
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
struct pcmcia_driver *p_drv = NULL;
int ret;
int ret = 0;
if (dev->driver)
p_drv = to_pcmcia_drv(dev->driver);
if (p_drv && p_drv->resume) {
p_dev->state &= ~DEV_SUSPEND;
if ((p_dev->state & DEV_CONFIG) &&
!(p_dev->state & DEV_SUSPEND_NORELEASE)){
ret = pcmcia_request_configuration(p_dev,
&p_dev->conf);
if (ret)
return ret;
}
return p_drv->resume(p_dev);
if ((p_dev->state & DEV_CONFIG) &&
!(p_dev->state & DEV_SUSPEND_NORELEASE)){
ret = pcmcia_request_configuration(p_dev,
&p_dev->conf);
if (ret)
goto out;
}
ret = p_drv->resume(p_dev);
}
return 0;
out:
if (!ret)
p_dev->suspended = 0;
return ret;
}

1
drivers/telephony/ixj_pcmcia.c
View File

@ -60,7 +60,6 @@ static void ixj_detach(struct pcmcia_device *link)
{
DEBUG(0, "ixj_detach(0x%p)\n", link);
link->state &= ~DEV_RELEASE_PENDING;
if (link->state & DEV_CONFIG)
ixj_cs_release(link);

6
include/pcmcia/ds.h
View File

@ -108,8 +108,6 @@ typedef struct dev_node_t {
#define DEV_CONFIG 0x02
#define DEV_SUSPEND_NORELEASE 0x04
#define DEV_CONFIG_PENDING 0x10
#define DEV_RELEASE_PENDING 0x20
#define DEV_SUSPEND 0x40
#define DEV_BUSY 0x80
#define DEV_OK(l) \
@ -163,13 +161,15 @@ struct pcmcia_device {
u_int p_state;
u8 suspended:1;
u8 reserved:3;
/* information about this device */
u8 has_manf_id:1;
u8 has_card_id:1;
u8 has_func_id:1;
u8 allow_func_id_match:1;
u8 reserved:4;
u8 func_id;
u16 manf_id;