Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 e2d40963 编写于 作者: D Dominik Brodowski
浏览文件
操作

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

Instead of the two status values struct pcmcia_device->p_state and state,
use descriptive bitfields. Most value-checking in drivers was invalid, as
the core now only calls the ->remove() (a.k.a. detach) function in case the
attachement _and_ configuration was successful.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>
上级 f6fbe01a
隐藏空白更改
内联 并排
Showing with 335 addition and 682 deletion
drivers/bluetooth/bluecard_cs.c
浏览文件 @ e2d40963
......@@ -244,7 +244,7 @@ static void bluecard_write_wakeup(bluecard_info_t *info)
clear_bit(XMIT_WAKEUP, &(info->tx_state));
if (!(info->p_dev->state & DEV_PRESENT))
if (!pcmcia_dev_present(info->p_dev))
return;
if (test_bit(XMIT_BUFFER_NUMBER, &(info->tx_state))) {
......@@ -879,7 +879,6 @@ static int bluecard_probe(struct pcmcia_device *link)
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return bluecard_config(link);
}
......@@ -888,9 +887,7 @@ static void bluecard_detach(struct pcmcia_device *link)
{
bluecard_info_t *info = link->priv;
if (link->state & DEV_CONFIG)
bluecard_release(link);
bluecard_release(link);
kfree(info);
}
......@@ -933,9 +930,6 @@ static int bluecard_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
link->conf.ConfigIndex = 0x20;
link->io.NumPorts1 = 64;
link->io.IOAddrLines = 6;
......@@ -969,7 +963,6 @@ static int bluecard_config(struct pcmcia_device *link)
strcpy(info->node.dev_name, info->hdev->name);
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
......@@ -986,8 +979,7 @@ static void bluecard_release(struct pcmcia_device *link)
{
bluecard_info_t *info = link->priv;
if (link->state & DEV_PRESENT)
bluecard_close(info);
bluecard_close(info);
del_timer(&(info->timer));
......
drivers/bluetooth/bt3c_cs.c
浏览文件 @ e2d40963
......@@ -195,7 +195,7 @@ static void bt3c_write_wakeup(bt3c_info_t *info)
register struct sk_buff *skb;
register int len;
if (!(info->p_dev->state & DEV_PRESENT))
if (!pcmcia_dev_present(info->p_dev))
break;
......@@ -668,7 +668,6 @@ static int bt3c_probe(struct pcmcia_device *link)
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return bt3c_config(link);
}
......@@ -677,9 +676,7 @@ static void bt3c_detach(struct pcmcia_device *link)
{
bt3c_info_t *info = link->priv;
if (link->state & DEV_CONFIG)
bt3c_release(link);
bt3c_release(link);
kfree(info);
}
......@@ -733,9 +730,6 @@ static int bt3c_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/* First pass: look for a config entry that looks normal. */
tuple.TupleData = (cisdata_t *)buf;
tuple.TupleOffset = 0;
......@@ -805,7 +799,6 @@ static int bt3c_config(struct pcmcia_device *link)
strcpy(info->node.dev_name, info->hdev->name);
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
......@@ -822,8 +815,7 @@ static void bt3c_release(struct pcmcia_device *link)
{
bt3c_info_t *info = link->priv;
if (link->state & DEV_PRESENT)
bt3c_close(info);
bt3c_close(info);
pcmcia_disable_device(link);
}
......
drivers/bluetooth/btuart_cs.c
浏览文件 @ e2d40963
......@@ -152,7 +152,7 @@ static void btuart_write_wakeup(btuart_info_t *info)
clear_bit(XMIT_WAKEUP, &(info->tx_state));
if (!(info->p_dev->state & DEV_PRESENT))
if (!pcmcia_dev_present(info->p_dev))
return;
if (!(skb = skb_dequeue(&(info->txq))))
......@@ -599,7 +599,6 @@ static int btuart_probe(struct pcmcia_device *link)
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return btuart_config(link);
}
......@@ -608,9 +607,7 @@ static void btuart_detach(struct pcmcia_device *link)
{
btuart_info_t *info = link->priv;
if (link->state & DEV_CONFIG)
btuart_release(link);
btuart_release(link);
kfree(info);
}
......@@ -664,9 +661,6 @@ static int btuart_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/* First pass: look for a config entry that looks normal. */
tuple.TupleData = (cisdata_t *) buf;
tuple.TupleOffset = 0;
......@@ -737,7 +731,6 @@ static int btuart_config(struct pcmcia_device *link)
strcpy(info->node.dev_name, info->hdev->name);
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
......@@ -754,8 +747,7 @@ static void btuart_release(struct pcmcia_device *link)
{
btuart_info_t *info = link->priv;
if (link->state & DEV_PRESENT)
btuart_close(info);
btuart_close(info);
pcmcia_disable_device(link);
}
......
drivers/bluetooth/dtl1_cs.c
浏览文件 @ e2d40963
......@@ -159,7 +159,7 @@ static void dtl1_write_wakeup(dtl1_info_t *info)
clear_bit(XMIT_WAKEUP, &(info->tx_state));
if (!(info->p_dev->state & DEV_PRESENT))
if (!pcmcia_dev_present(info->p_dev))
return;
if (!(skb = skb_dequeue(&(info->txq))))
......@@ -578,7 +578,6 @@ static int dtl1_probe(struct pcmcia_device *link)
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return dtl1_config(link);
}
......@@ -587,8 +586,7 @@ static void dtl1_detach(struct pcmcia_device *link)
{
dtl1_info_t *info = link->priv;
if (link->state & DEV_CONFIG)
dtl1_release(link);
dtl1_release(link);
kfree(info);
}
......@@ -642,9 +640,6 @@ static int dtl1_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
tuple.TupleData = (cisdata_t *)buf;
tuple.TupleOffset = 0;
tuple.TupleDataMax = 255;
......@@ -689,7 +684,6 @@ static int dtl1_config(struct pcmcia_device *link)
strcpy(info->node.dev_name, info->hdev->name);
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
......@@ -706,8 +700,7 @@ static void dtl1_release(struct pcmcia_device *link)
{
dtl1_info_t *info = link->priv;
if (link->state & DEV_PRESENT)
dtl1_close(info);
dtl1_close(info);
pcmcia_disable_device(link);
}
......
drivers/char/pcmcia/cm4000_cs.c
浏览文件 @ e2d40963
......@@ -971,7 +971,7 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
if (count == 0) /* according to manpage */
return 0;
if ((dev->p_dev->state & DEV_PRESENT) == 0 || /* socket removed */
if (!pcmcia_dev_present(dev->p_dev) || /* device removed */
test_bit(IS_CMM_ABSENT, &dev->flags))
return -ENODEV;
......@@ -1108,7 +1108,7 @@ static ssize_t cmm_write(struct file *filp, const char __user *buf,
sendT0 = dev->proto ? 0 : nr > 5 ? 0x08 : 0;
if ((dev->p_dev->state & DEV_PRESENT) == 0 || /* socket removed */
if (!pcmcia_dev_present(dev->p_dev) || /* device removed */
test_bit(IS_CMM_ABSENT, &dev->flags))
return -ENODEV;
......@@ -1789,7 +1789,6 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
goto cs_failed;
}
link->state |= DEV_CONFIG;
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
......@@ -1844,7 +1843,6 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
dev->node.minor = devno;
dev->node.next = NULL;
link->dev_node = &dev->node;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
......@@ -1852,8 +1850,6 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
cs_error(link, fail_fn, fail_rc);
cs_release:
cm4000_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
}
......@@ -1913,7 +1909,6 @@ static int cm4000_probe(struct pcmcia_device *link)
init_waitqueue_head(&dev->atrq);
init_waitqueue_head(&dev->readq);
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
ret = cm4000_config(link, i);
if (ret)
return ret;
......@@ -1936,11 +1931,9 @@ static void cm4000_detach(struct pcmcia_device *link)
if (devno == CM4000_MAX_DEV)
return;
link->state &= ~DEV_PRESENT;
stop_monitor(dev);
if (link->state & DEV_CONFIG)
cm4000_release(link);
cm4000_release(link);
dev_table[devno] = NULL;
kfree(dev);
......
drivers/char/pcmcia/cm4040_cs.c
浏览文件 @ e2d40963
......@@ -246,7 +246,7 @@ static ssize_t cm4040_read(struct file *filp, char __user *buf,
return -EAGAIN;
}
if ((dev->p_dev->state & DEV_PRESENT)==0)
if (!pcmcia_dev_present(dev->p_dev))
return -ENODEV;
for (i = 0; i < 5; i++) {
......@@ -351,7 +351,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf,
return -EAGAIN;
}
if ((dev->p_dev->state & DEV_PRESENT) == 0)
if (!pcmcia_dev_present(dev->p_dev))
return -ENODEV;
bytes_to_write = count;
......@@ -543,7 +543,6 @@ static int reader_config(struct pcmcia_device *link, int devno)
goto cs_failed;
}
link->state |= DEV_CONFIG;
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
......@@ -602,9 +601,7 @@ static int reader_config(struct pcmcia_device *link, int devno)
sprintf(dev->node.dev_name, DEVICE_NAME "%d", devno);
dev->node.major = major;
dev->node.minor = devno;
dev->node.next = NULL;
link->dev_node = &dev->node;
link->state &= ~DEV_CONFIG_PENDING;
dev->node.next = &dev->node;
DEBUGP(2, dev, "device " DEVICE_NAME "%d at 0x%.4x-0x%.4x\n", devno,
link->io.BasePort1, link->io.BasePort1+link->io.NumPorts1);
......@@ -616,7 +613,6 @@ static int reader_config(struct pcmcia_device *link, int devno)
cs_error(link, fail_fn, fail_rc);
cs_release:
reader_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
}
......@@ -659,7 +655,6 @@ static int reader_probe(struct pcmcia_device *link)
init_timer(&dev->poll_timer);
dev->poll_timer.function = &cm4040_do_poll;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
ret = reader_config(link, i);
if (ret)
return ret;
......@@ -683,10 +678,7 @@ static void reader_detach(struct pcmcia_device *link)
if (devno == CM_MAX_DEV)
return;
link->state &= ~DEV_PRESENT;
if (link->state & DEV_CONFIG)
reader_release(link);
reader_release(link);
dev_table[devno] = NULL;
kfree(dev);
......
drivers/char/pcmcia/synclink_cs.c
浏览文件 @ e2d40963
......@@ -578,7 +578,6 @@ static int mgslpc_probe(struct pcmcia_device *link)
link->conf.Attributes = 0;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
ret = mgslpc_config(link);
if (ret)
return ret;
......@@ -618,9 +617,6 @@ static int mgslpc_config(struct pcmcia_device *link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/* get CIS configuration entry */
......@@ -681,8 +677,6 @@ static int mgslpc_config(struct pcmcia_device *link)
printk(", io 0x%04x-0x%04x", link->io.BasePort1,
link->io.BasePort1+link->io.NumPorts1-1);
printk("\n");
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
......@@ -697,25 +691,23 @@ static int mgslpc_config(struct pcmcia_device *link)
*/
static void mgslpc_release(u_long arg)
{
struct pcmcia_device *link = (struct pcmcia_device *)arg;
struct pcmcia_device *link = (struct pcmcia_device *)arg;
if (debug_level >= DEBUG_LEVEL_INFO)
printk("mgslpc_release(0x%p)\n", link);
if (debug_level >= DEBUG_LEVEL_INFO)
printk("mgslpc_release(0x%p)\n", link);
pcmcia_disable_device(link);
pcmcia_disable_device(link);
}
static void mgslpc_detach(struct pcmcia_device *link)
{
if (debug_level >= DEBUG_LEVEL_INFO)
printk("mgslpc_detach(0x%p)\n", link);
if (debug_level >= DEBUG_LEVEL_INFO)
printk("mgslpc_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG) {
((MGSLPC_INFO *)link->priv)->stop = 1;
mgslpc_release((u_long)link);
}
((MGSLPC_INFO *)link->priv)->stop = 1;
mgslpc_release((u_long)link);
mgslpc_remove_device((MGSLPC_INFO *)link->priv);
mgslpc_remove_device((MGSLPC_INFO *)link->priv);
}
static int mgslpc_suspend(struct pcmcia_device *link)
......@@ -1254,7 +1246,7 @@ static irqreturn_t mgslpc_isr(int irq, void *dev_id, struct pt_regs * regs)
if (!info)
return IRQ_NONE;
if (!(info->p_dev->state & DEV_CONFIG))
if (!(info->p_dev->_locked))
return IRQ_HANDLED;
spin_lock(&info->lock);
......
drivers/ide/legacy/ide-cs.c
浏览文件 @ e2d40963
......@@ -125,7 +125,6 @@ static int ide_probe(struct pcmcia_device *link)
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return ide_config(link);
} /* ide_attach */
......@@ -142,8 +141,7 @@ static void ide_detach(struct pcmcia_device *link)
{
DEBUG(0, "ide_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
ide_release(link);
ide_release(link);
kfree(link->priv);
} /* ide_detach */
......@@ -209,9 +207,6 @@ static int ide_config(struct pcmcia_device *link)
((stk->parse.manfid.card == PRODID_KME_KXLC005_A) ||
(stk->parse.manfid.card == PRODID_KME_KXLC005_B)));
/* Configure card */
link->state |= DEV_CONFIG;
/* Not sure if this is right... look up the current Vcc */
CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf));
......@@ -323,7 +318,6 @@ static int ide_config(struct pcmcia_device *link)
printk(KERN_INFO "ide-cs: %s: Vpp = %d.%d\n",
info->node.dev_name, link->conf.Vpp / 10, link->conf.Vpp % 10);
link->state &= ~DEV_CONFIG_PENDING;
kfree(stk);
return 0;
......@@ -336,7 +330,6 @@ static int ide_config(struct pcmcia_device *link)
failed:
kfree(stk);
ide_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
} /* ide_config */
......
drivers/isdn/hardware/avm/avm_cs.c
浏览文件 @ e2d40963
......@@ -127,7 +127,6 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
memset(local, 0, sizeof(local_info_t));
p_dev->priv = local;
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return avmcs_config(p_dev);
err:
......@@ -145,10 +144,8 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
static void avmcs_detach(struct pcmcia_device *link)
{
if (link->state & DEV_CONFIG)
avmcs_release(link);
kfree(link->priv);
kfree(link->priv);
} /* avmcs_detach */
/*======================================================================
......@@ -216,12 +213,8 @@ static int avmcs_config(struct pcmcia_device *link)
} while (0);
if (i != CS_SUCCESS) {
cs_error(link, ParseTuple, i);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
}
/* Configure card */
link->state |= DEV_CONFIG;
do {
......@@ -312,8 +305,7 @@ static int avmcs_config(struct pcmcia_device *link)
dev->node.major = 64;
dev->node.minor = 0;
link->dev_node = &dev->node;
link->state &= ~DEV_CONFIG_PENDING;
/* If any step failed, release any partially configured state */
if (i != 0) {
avmcs_release(link);
......
drivers/isdn/hisax/avma1_cs.c
浏览文件 @ e2d40963
......@@ -149,7 +149,6 @@ static int avma1cs_probe(struct pcmcia_device *p_dev)
p_dev->conf.ConfigIndex = 1;
p_dev->conf.Present = PRESENT_OPTION;
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return avma1cs_config(p_dev);
} /* avma1cs_attach */
......@@ -164,12 +163,9 @@ static int avma1cs_probe(struct pcmcia_device *p_dev)
static void avma1cs_detach(struct pcmcia_device *link)
{
DEBUG(0, "avma1cs_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
avma1cs_release(link);
kfree(link->priv);
DEBUG(0, "avma1cs_detach(0x%p)\n", link);
avma1cs_release(link);
kfree(link->priv);
} /* avma1cs_detach */
/*======================================================================
......@@ -239,12 +235,8 @@ static int avma1cs_config(struct pcmcia_device *link)
} while (0);
if (i != CS_SUCCESS) {
cs_error(link, ParseTuple, i);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
}
/* Configure card */
link->state |= DEV_CONFIG;
do {
......@@ -318,8 +310,7 @@ static int avma1cs_config(struct pcmcia_device *link)
dev->node.major = 45;
dev->node.minor = 0;
link->dev_node = &dev->node;
link->state &= ~DEV_CONFIG_PENDING;
/* If any step failed, release any partially configured state */
if (i != 0) {
avma1cs_release(link);
......
drivers/isdn/hisax/elsa_cs.c
浏览文件 @ e2d40963
......@@ -174,7 +174,6 @@ static int elsa_cs_probe(struct pcmcia_device *link)
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return elsa_cs_config(link);
} /* elsa_cs_attach */
......@@ -189,17 +188,14 @@ static int elsa_cs_probe(struct pcmcia_device *link)
static void elsa_cs_detach(struct pcmcia_device *link)
{
local_info_t *info = link->priv;
local_info_t *info = link->priv;
DEBUG(0, "elsa_cs_detach(0x%p)\n", link);
DEBUG(0, "elsa_cs_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG) {
info->busy = 1;
elsa_cs_release(link);
}
kfree(info);
info->busy = 1;
elsa_cs_release(link);
kfree(info);
} /* elsa_cs_detach */
/*======================================================================
......@@ -263,9 +259,6 @@ static int elsa_cs_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
tuple.TupleData = (cisdata_t *)buf;
tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
tuple.Attributes = 0;
......@@ -329,8 +322,6 @@ static int elsa_cs_config(struct pcmcia_device *link)
link->io.BasePort2+link->io.NumPorts2-1);
printk("\n");
link->state &= ~DEV_CONFIG_PENDING;
icard.para[0] = link->irq.AssignedIRQ;
icard.para[1] = link->io.BasePort1;
icard.protocol = protocol;
......
drivers/isdn/hisax/sedlbauer_cs.c
浏览文件 @ e2d40963
......@@ -186,7 +186,6 @@ static int sedlbauer_probe(struct pcmcia_device *link)
link->conf.Attributes = 0;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return sedlbauer_config(link);
} /* sedlbauer_attach */
......@@ -201,15 +200,13 @@ static int sedlbauer_probe(struct pcmcia_device *link)
static void sedlbauer_detach(struct pcmcia_device *link)
{
DEBUG(0, "sedlbauer_detach(0x%p)\n", link);
DEBUG(0, "sedlbauer_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG) {
((local_info_t *)link->priv)->stop = 1;
sedlbauer_release(link);
}
((local_info_t *)link->priv)->stop = 1;
sedlbauer_release(link);
/* This points to the parent local_info_t struct */
kfree(link->priv);
/* This points to the parent local_info_t struct */
kfree(link->priv);
} /* sedlbauer_detach */
/*======================================================================
......@@ -250,9 +247,6 @@ static int sedlbauer_config(struct pcmcia_device *link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &conf));
......@@ -408,8 +402,6 @@ static int sedlbauer_config(struct pcmcia_device *link)
printk(", mem 0x%06lx-0x%06lx", req.Base,
req.Base+req.Size-1);
printk("\n");
link->state &= ~DEV_CONFIG_PENDING;
icard.para[0] = link->irq.AssignedIRQ;
icard.para[1] = link->io.BasePort1;
......
drivers/isdn/hisax/teles_cs.c
浏览文件 @ e2d40963
......@@ -164,7 +164,6 @@ static int teles_probe(struct pcmcia_device *link)
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return teles_cs_config(link);
} /* teles_attach */
......@@ -179,17 +178,14 @@ static int teles_probe(struct pcmcia_device *link)
static void teles_detach(struct pcmcia_device *link)
{
local_info_t *info = link->priv;
local_info_t *info = link->priv;
DEBUG(0, "teles_detach(0x%p)\n", link);
DEBUG(0, "teles_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG) {
info->busy = 1;
teles_cs_release(link);
}
kfree(info);
info->busy = 1;
teles_cs_release(link);
kfree(info);
} /* teles_detach */
/*======================================================================
......@@ -253,9 +249,6 @@ static int teles_cs_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
tuple.TupleData = (cisdata_t *)buf;
tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
tuple.Attributes = 0;
......@@ -319,8 +312,6 @@ static int teles_cs_config(struct pcmcia_device *link)
link->io.BasePort2+link->io.NumPorts2-1);
printk("\n");
link->state &= ~DEV_CONFIG_PENDING;
icard.para[0] = link->irq.AssignedIRQ;
icard.para[1] = link->io.BasePort1;
icard.protocol = protocol;
......
drivers/mtd/maps/pcmciamtd.c
浏览文件 @ e2d40963
......@@ -111,8 +111,8 @@ static caddr_t remap_window(struct map_info *map, unsigned long to)
memreq_t mrq;
int ret;
if(!(dev->p_dev->state & DEV_PRESENT)) {
DEBUG(1, "device removed state = 0x%4.4X", dev->p_dev->state);
if (!pcmcia_dev_present(dev->p_dev)) {
DEBUG(1, "device removed");
return 0;
}
......@@ -238,7 +238,7 @@ static void pcmcia_copy_to_remap(struct map_info *map, unsigned long to, const v
/* read/write{8,16} copy_{from,to} routines with direct access */
#define DEV_REMOVED(x) (!(*(u_int *)x->map_priv_1 & DEV_PRESENT))
#define DEV_REMOVED(x) (!(pcmcia_dev_present(((struct pcmciamtd_dev *)map->map_priv_1)->p_dev)))
static map_word pcmcia_read8(struct map_info *map, unsigned long ofs)
{
......@@ -503,9 +503,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
DEBUG(3, "link=0x%p", link);
/* Configure card */
link->state |= DEV_CONFIG;
DEBUG(2, "Validating CIS");
ret = pcmcia_validate_cis(link, &cisinfo);
if(ret != CS_SUCCESS) {
......@@ -651,7 +648,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
use the faster non-remapping read/write functions */
if(mtd->size <= dev->win_size) {
DEBUG(1, "Using non remapping memory functions");
dev->pcmcia_map.map_priv_1 = (unsigned long)&(dev->p_dev->state);
dev->pcmcia_map.map_priv_2 = (unsigned long)dev->win_base;
if (dev->pcmcia_map.bankwidth == 1) {
dev->pcmcia_map.read = pcmcia_read8;
......@@ -673,7 +669,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
}
snprintf(dev->node.dev_name, sizeof(dev->node.dev_name), "mtd%d", mtd->index);
info("mtd%d: %s", mtd->index, mtd->name);
link->state &= ~DEV_CONFIG_PENDING;
link->dev_node = &dev->node;
return 0;
......@@ -712,17 +707,16 @@ static int pcmciamtd_resume(struct pcmcia_device *dev)
static void pcmciamtd_detach(struct pcmcia_device *link)
{
DEBUG(3, "link=0x%p", link);
struct pcmciamtd_dev *dev = link->priv;
if(link->state & DEV_CONFIG) {
struct pcmciamtd_dev *dev = link->priv;
if(dev->mtd_info) {
del_mtd_device(dev->mtd_info);
info("mtd%d: Removed", dev->mtd_info->index);
}
DEBUG(3, "link=0x%p", link);
pcmciamtd_release(link);
if(dev->mtd_info) {
del_mtd_device(dev->mtd_info);
info("mtd%d: Removed", dev->mtd_info->index);
}
pcmciamtd_release(link);
}
......@@ -747,7 +741,6 @@ static int pcmciamtd_probe(struct pcmcia_device *link)
link->conf.Attributes = 0;
link->conf.IntType = INT_MEMORY;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return pcmciamtd_config(link);
}
......
drivers/net/pcmcia/3c574_cs.c
浏览文件 @ e2d40963
......@@ -296,7 +296,6 @@ static int tc574_probe(struct pcmcia_device *link)
dev->watchdog_timeo = TX_TIMEOUT;
#endif
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return tc574_config(link);
} /* tc574_attach */
......@@ -318,8 +317,7 @@ static void tc574_detach(struct pcmcia_device *link)
if (link->dev_node)
unregister_netdev(dev);
if (link->state & DEV_CONFIG)
tc574_release(link);
tc574_release(link);
free_netdev(dev);
} /* tc574_detach */
......@@ -363,9 +361,6 @@ static int tc574_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
link->io.IOAddrLines = 16;
for (i = j = 0; j < 0x400; j += 0x20) {
link->io.BasePort1 = j ^ 0x300;
......@@ -464,7 +459,6 @@ static int tc574_config(struct pcmcia_device *link)
}
}
link->state &= ~DEV_CONFIG_PENDING;
link->dev_node = &lp->node;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
......@@ -509,7 +503,7 @@ static int tc574_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -519,7 +513,7 @@ static int tc574_resume(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
tc574_reset(dev);
netif_device_attach(dev);
}
......
drivers/net/pcmcia/3c589_cs.c
浏览文件 @ e2d40963
......@@ -211,7 +211,6 @@ static int tc589_probe(struct pcmcia_device *link)
#endif
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return tc589_config(link);
} /* tc589_attach */
......@@ -233,8 +232,7 @@ static void tc589_detach(struct pcmcia_device *link)
if (link->dev_node)
unregister_netdev(dev);
if (link->state & DEV_CONFIG)
tc589_release(link);
tc589_release(link);
free_netdev(dev);
} /* tc589_detach */
......@@ -285,9 +283,6 @@ static int tc589_config(struct pcmcia_device *link)
"3Com card??\n");
multi = (le16_to_cpu(buf[1]) == PRODID_3COM_3C562);
}
/* Configure card */
link->state |= DEV_CONFIG;
/* For the 3c562, the base address must be xx00-xx7f */
link->io.IOAddrLines = 16;
......@@ -338,7 +333,6 @@ static int tc589_config(struct pcmcia_device *link)
printk(KERN_ERR "3c589_cs: invalid if_port requested\n");
link->dev_node = &lp->node;
link->state &= ~DEV_CONFIG_PENDING;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
if (register_netdev(dev) != 0) {
......@@ -383,7 +377,7 @@ static int tc589_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -393,7 +387,7 @@ static int tc589_resume(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
tc589_reset(dev);
netif_device_attach(dev);
}
......
drivers/net/pcmcia/axnet_cs.c
浏览文件 @ e2d40963
......@@ -168,7 +168,6 @@ static int axnet_probe(struct pcmcia_device *link)
dev->do_ioctl = &axnet_ioctl;
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return axnet_config(link);
} /* axnet_attach */
......@@ -190,8 +189,7 @@ static void axnet_detach(struct pcmcia_device *link)
if (link->dev_node)
unregister_netdev(dev);
if (link->state & DEV_CONFIG)
axnet_release(link);
axnet_release(link);
free_netdev(dev);
} /* axnet_detach */
......@@ -309,9 +307,6 @@ static int axnet_config(struct pcmcia_device *link)
/* don't trust the CIS on this; Linksys got it wrong */
link->conf.Present = 0x63;
/* Configure card */
link->state |= DEV_CONFIG;
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
tuple.Attributes = 0;
CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
......@@ -402,7 +397,6 @@ static int axnet_config(struct pcmcia_device *link)
info->phy_id = (i < 32) ? i : -1;
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
if (register_netdev(dev) != 0) {
......@@ -429,7 +423,6 @@ static int axnet_config(struct pcmcia_device *link)
cs_error(link, last_fn, last_ret);
failed:
axnet_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
} /* axnet_config */
......@@ -450,8 +443,8 @@ static int axnet_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open))
netif_device_detach(dev);
if (link->open)
netif_device_detach(dev);
return 0;
}
......@@ -460,7 +453,7 @@ static int axnet_resume(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
axnet_reset_8390(dev);
AX88190_init(dev, 1);
netif_device_attach(dev);
......
drivers/net/pcmcia/com20020_cs.c
浏览文件 @ e2d40963
......@@ -178,7 +178,6 @@ static int com20020_probe(struct pcmcia_device *p_dev)
p_dev->irq.Instance = info->dev = dev;
p_dev->priv = info;
p_dev->state |= DEV_PRESENT;
return com20020_config(p_dev);
fail_alloc_dev:
......@@ -218,8 +217,7 @@ static void com20020_detach(struct pcmcia_device *link)
free_irq(dev->irq, dev);
}
if (link->state & DEV_CONFIG)
com20020_release(link);
com20020_release(link);
/* Unlink device structure, free bits */
DEBUG(1,"unlinking...\n");
......@@ -276,9 +274,6 @@ static int com20020_config(struct pcmcia_device *link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
/* Configure card */
link->state |= DEV_CONFIG;
DEBUG(1,"arcnet: baseport1 is %Xh\n", link->io.BasePort1);
i = !CS_SUCCESS;
if (!link->io.BasePort1)
......@@ -328,7 +323,6 @@ static int com20020_config(struct pcmcia_device *link)
lp->card_flags = ARC_CAN_10MBIT; /* pretend all of them can 10Mbit */
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
i = com20020_found(dev, 0); /* calls register_netdev */
......@@ -372,7 +366,7 @@ static int com20020_suspend(struct pcmcia_device *link)
com20020_dev_t *info = link->priv;
struct net_device *dev = info->dev;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -383,7 +377,7 @@ static int com20020_resume(struct pcmcia_device *link)
com20020_dev_t *info = link->priv;
struct net_device *dev = info->dev;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
int ioaddr = dev->base_addr;
struct arcnet_local *lp = dev->priv;
ARCRESET;
......
drivers/net/pcmcia/fmvj18x_cs.c
浏览文件 @ e2d40963
......@@ -272,7 +272,6 @@ static int fmvj18x_probe(struct pcmcia_device *link)
#endif
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return fmvj18x_config(link);
} /* fmvj18x_attach */
......@@ -287,8 +286,7 @@ static void fmvj18x_detach(struct pcmcia_device *link)
if (link->dev_node)
unregister_netdev(dev);
if (link->state & DEV_CONFIG)
fmvj18x_release(link);
fmvj18x_release(link);
free_netdev(dev);
} /* fmvj18x_detach */
......@@ -363,9 +361,6 @@ static int fmvj18x_config(struct pcmcia_device *link)
tuple.TupleOffset = 0;
CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
/* Configure card */
link->state |= DEV_CONFIG;
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
......@@ -532,7 +527,6 @@ static int fmvj18x_config(struct pcmcia_device *link)
lp->cardtype = cardtype;
link->dev_node = &lp->node;
link->state &= ~DEV_CONFIG_PENDING;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
if (register_netdev(dev) != 0) {
......@@ -557,7 +551,6 @@ static int fmvj18x_config(struct pcmcia_device *link)
cs_error(link, last_fn, last_ret);
failed:
fmvj18x_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
} /* fmvj18x_config */
/*====================================================================*/
......@@ -668,7 +661,7 @@ static int fmvj18x_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -678,7 +671,7 @@ static int fmvj18x_resume(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
fjn_reset(dev);
netif_device_attach(dev);
}
......
drivers/net/pcmcia/ibmtr_cs.c
浏览文件 @ e2d40963
......@@ -173,7 +173,6 @@ static int ibmtr_attach(struct pcmcia_device *link)
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
link->state |= DEV_PRESENT;
return ibmtr_config(link);
} /* ibmtr_attach */
......@@ -200,8 +199,8 @@ static void ibmtr_detach(struct pcmcia_device *link)
struct tok_info *ti = netdev_priv(dev);
del_timer_sync(&(ti->tr_timer));
}
if (link->state & DEV_CONFIG)
ibmtr_release(link);
ibmtr_release(link);
free_netdev(dev);
kfree(info);
......@@ -241,10 +240,6 @@ static int ibmtr_config(struct pcmcia_device *link)
CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
/* Configure card */
link->state |= DEV_CONFIG;
link->conf.ConfigIndex = 0x61;
/* Determine if this is PRIMARY or ALTERNATE. */
......@@ -301,7 +296,6 @@ static int ibmtr_config(struct pcmcia_device *link)
ibmtr_hw_setup(dev, mmiobase);
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
i = ibmtr_probe_card(dev);
......@@ -358,7 +352,7 @@ static int ibmtr_suspend(struct pcmcia_device *link)
ibmtr_dev_t *info = link->priv;
struct net_device *dev = info->dev;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -369,7 +363,7 @@ static int ibmtr_resume(struct pcmcia_device *link)
ibmtr_dev_t *info = link->priv;
struct net_device *dev = info->dev;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
ibmtr_probe(dev); /* really? */
netif_device_attach(dev);
}
......
drivers/net/pcmcia/nmclan_cs.c
浏览文件 @ e2d40963
......@@ -487,7 +487,6 @@ static int nmclan_probe(struct pcmcia_device *link)
dev->watchdog_timeo = TX_TIMEOUT;
#endif
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return nmclan_config(link);
} /* nmclan_attach */
......@@ -508,8 +507,7 @@ static void nmclan_detach(struct pcmcia_device *link)
if (link->dev_node)
unregister_netdev(dev);
if (link->state & DEV_CONFIG)
nmclan_release(link);
nmclan_release(link);
free_netdev(dev);
} /* nmclan_detach */
......@@ -675,9 +673,6 @@ static int nmclan_config(struct pcmcia_device *link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
/* 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));
......@@ -707,7 +702,6 @@ static int nmclan_config(struct pcmcia_device *link)
} else {
printk(KERN_NOTICE "nmclan_cs: mace id not found: %x %x should"
" be 0x40 0x?9\n", sig[0], sig[1]);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
}
}
......@@ -722,7 +716,6 @@ static int nmclan_config(struct pcmcia_device *link)
printk(KERN_NOTICE "nmclan_cs: invalid if_port requested\n");
link->dev_node = &lp->node;
link->state &= ~DEV_CONFIG_PENDING;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
i = register_netdev(dev);
......@@ -763,7 +756,7 @@ static int nmclan_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -773,7 +766,7 @@ static int nmclan_resume(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
nmclan_reset(dev);
netif_device_attach(dev);
}
......
drivers/net/pcmcia/pcnet_cs.c
浏览文件 @ e2d40963
......@@ -264,7 +264,6 @@ static int pcnet_probe(struct pcmcia_device *link)
dev->stop = &pcnet_close;
dev->set_config = &set_config;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return pcnet_config(link);
} /* pcnet_attach */
......@@ -286,8 +285,7 @@ static void pcnet_detach(struct pcmcia_device *link)
if (link->dev_node)
unregister_netdev(dev);
if (link->state & DEV_CONFIG)
pcnet_release(link);
pcnet_release(link);
free_netdev(dev);
} /* pcnet_detach */
......@@ -538,9 +536,6 @@ static int pcnet_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
tuple.DesiredTuple = CISTPL_MANFID;
tuple.Attributes = TUPLE_RETURN_COMMON;
if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) &&
......@@ -667,7 +662,6 @@ static int pcnet_config(struct pcmcia_device *link)
}
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
#ifdef CONFIG_NET_POLL_CONTROLLER
......@@ -705,7 +699,6 @@ static int pcnet_config(struct pcmcia_device *link)
cs_error(link, last_fn, last_ret);
failed:
pcnet_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
} /* pcnet_config */
......@@ -742,7 +735,7 @@ static int pcnet_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -752,7 +745,7 @@ static int pcnet_resume(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
pcnet_reset_8390(dev);
NS8390_init(dev, 1);
netif_device_attach(dev);
......
drivers/net/pcmcia/smc91c92_cs.c
浏览文件 @ e2d40963
......@@ -356,7 +356,6 @@ static int smc91c92_probe(struct pcmcia_device *link)
smc->mii_if.phy_id_mask = 0x1f;
smc->mii_if.reg_num_mask = 0x1f;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return smc91c92_config(link);
} /* smc91c92_attach */
......@@ -378,8 +377,7 @@ static void smc91c92_detach(struct pcmcia_device *link)
if (link->dev_node)
unregister_netdev(dev);
if (link->state & DEV_CONFIG)
smc91c92_release(link);
smc91c92_release(link);
free_netdev(dev);
} /* smc91c92_detach */
......@@ -862,7 +860,7 @@ static int smc91c92_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -874,33 +872,31 @@ static int smc91c92_resume(struct pcmcia_device *link)
struct smc_private *smc = netdev_priv(dev);
int i;
if (link->state & DEV_CONFIG) {
if ((smc->manfid == MANFID_MEGAHERTZ) &&
(smc->cardid == PRODID_MEGAHERTZ_EM3288))
mhz_3288_power(link);
if (smc->manfid == MANFID_MOTOROLA)
mot_config(link);
if ((smc->manfid == MANFID_OSITECH) &&
(smc->cardid != PRODID_OSITECH_SEVEN)) {
/* Power up the card and enable interrupts */
set_bits(0x0300, dev->base_addr-0x10+OSITECH_AUI_PWR);
set_bits(0x0300, dev->base_addr-0x10+OSITECH_RESET_ISR);
}
if (((smc->manfid == MANFID_OSITECH) &&
(smc->cardid == PRODID_OSITECH_SEVEN)) ||
((smc->manfid == MANFID_PSION) &&
(smc->cardid == PRODID_PSION_NET100))) {
/* Download the Seven of Diamonds firmware */
for (i = 0; i < sizeof(__Xilinx7OD); i++) {
outb(__Xilinx7OD[i], link->io.BasePort1+2);
udelay(50);
}
}
if (link->open) {
smc_reset(dev);
netif_device_attach(dev);
if ((smc->manfid == MANFID_MEGAHERTZ) &&
(smc->cardid == PRODID_MEGAHERTZ_EM3288))
mhz_3288_power(link);
if (smc->manfid == MANFID_MOTOROLA)
mot_config(link);
if ((smc->manfid == MANFID_OSITECH) &&
(smc->cardid != PRODID_OSITECH_SEVEN)) {
/* Power up the card and enable interrupts */
set_bits(0x0300, dev->base_addr-0x10+OSITECH_AUI_PWR);
set_bits(0x0300, dev->base_addr-0x10+OSITECH_RESET_ISR);
}
if (((smc->manfid == MANFID_OSITECH) &&
(smc->cardid == PRODID_OSITECH_SEVEN)) ||
((smc->manfid == MANFID_PSION) &&
(smc->cardid == PRODID_PSION_NET100))) {
/* Download the Seven of Diamonds firmware */
for (i = 0; i < sizeof(__Xilinx7OD); i++) {
outb(__Xilinx7OD[i], link->io.BasePort1+2);
udelay(50);
}
}
if (link->open) {
smc_reset(dev);
netif_device_attach(dev);
}
return 0;
}
......@@ -1010,9 +1006,6 @@ static int smc91c92_config(struct pcmcia_device *link)
smc->cardid = parse->manfid.card;
}
/* Configure card */
link->state |= DEV_CONFIG;
if ((smc->manfid == MANFID_OSITECH) &&
(smc->cardid != PRODID_OSITECH_SEVEN)) {
i = osi_config(link);
......@@ -1108,7 +1101,6 @@ static int smc91c92_config(struct pcmcia_device *link)
}
link->dev_node = &smc->node;
link->state &= ~DEV_CONFIG_PENDING;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
if (register_netdev(dev) != 0) {
......@@ -1149,7 +1141,6 @@ static int smc91c92_config(struct pcmcia_device *link)
unregister_netdev(dev);
config_failed: /* CS_EXIT_TEST() calls jump to here... */
smc91c92_release(link);
link->state &= ~DEV_CONFIG_PENDING;
kfree(cfg_mem);
return -ENODEV;
} /* smc91c92_config */
......
drivers/net/pcmcia/xirc2ps_cs.c
浏览文件 @ e2d40963
......@@ -591,7 +591,6 @@ xirc2ps_probe(struct pcmcia_device *link)
dev->watchdog_timeo = TX_TIMEOUT;
#endif
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return xirc2ps_config(link);
} /* xirc2ps_attach */
......@@ -612,8 +611,7 @@ xirc2ps_detach(struct pcmcia_device *link)
if (link->dev_node)
unregister_netdev(dev);
if (link->state & DEV_CONFIG)
xirc2ps_release(link);
xirc2ps_release(link);
free_netdev(dev);
} /* xirc2ps_detach */
......@@ -843,9 +841,6 @@ xirc2ps_config(struct pcmcia_device * link)
for (i=0; i < 6; i++)
dev->dev_addr[i] = node_id->id[i];
/* Configure card */
link->state |= DEV_CONFIG;
link->io.IOAddrLines =10;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
link->irq.Attributes = IRQ_HANDLE_PRESENT;
......@@ -1041,7 +1036,6 @@ xirc2ps_config(struct pcmcia_device * link)
do_reset(dev, 1); /* a kludge to make the cem56 work */
link->dev_node = &local->node;
link->state &= ~DEV_CONFIG_PENDING;
SET_NETDEV_DEV(dev, &handle_to_dev(link));
if ((err=register_netdev(dev))) {
......@@ -1062,14 +1056,12 @@ xirc2ps_config(struct pcmcia_device * link)
return 0;
config_error:
link->state &= ~DEV_CONFIG_PENDING;
xirc2ps_release(link);
return -ENODEV;
cis_error:
printk(KNOT_XIRC "unable to parse CIS\n");
failure:
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
} /* xirc2ps_config */
......@@ -1099,9 +1091,9 @@ static int xirc2ps_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
netif_device_detach(dev);
do_powerdown(dev);
if (link->open) {
netif_device_detach(dev);
do_powerdown(dev);
}
return 0;
......@@ -1111,7 +1103,7 @@ static int xirc2ps_resume(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
do_reset(dev,1);
netif_device_attach(dev);
}
......
drivers/net/wireless/airo_cs.c
浏览文件 @ e2d40963
......@@ -170,7 +170,6 @@ static int airo_probe(struct pcmcia_device *p_dev)
}
p_dev->priv = local;
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return airo_config(p_dev);
} /* airo_attach */
......@@ -187,8 +186,7 @@ static void airo_detach(struct pcmcia_device *link)
{
DEBUG(0, "airo_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
airo_release(link);
airo_release(link);
if ( ((local_info_t*)link->priv)->eth_dev ) {
stop_airo_card( ((local_info_t*)link->priv)->eth_dev, 0 );
......@@ -237,10 +235,7 @@ static int airo_config(struct pcmcia_device *link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/*
In this loop, we scan the CIS for configuration table entries,
each of which describes a valid card configuration, including
......@@ -382,8 +377,6 @@ static int airo_config(struct pcmcia_device *link)
printk(", mem 0x%06lx-0x%06lx", req.Base,
req.Base+req.Size-1);
printk("\n");
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
......@@ -410,8 +403,7 @@ static int airo_suspend(struct pcmcia_device *link)
{
local_info_t *local = link->priv;
if (link->state & DEV_CONFIG)
netif_device_detach(local->eth_dev);
netif_device_detach(local->eth_dev);
return 0;
}
......@@ -420,7 +412,7 @@ static int airo_resume(struct pcmcia_device *link)
{
local_info_t *local = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
reset_airo_card(local->eth_dev);
netif_device_attach(local->eth_dev);
}
......
drivers/net/wireless/atmel_cs.c
浏览文件 @ e2d40963
......@@ -181,7 +181,6 @@ static int atmel_probe(struct pcmcia_device *p_dev)
}
p_dev->priv = local;
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return atmel_config(p_dev);
} /* atmel_attach */
......@@ -198,8 +197,7 @@ static void atmel_detach(struct pcmcia_device *link)
{
DEBUG(0, "atmel_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
atmel_release(link);
atmel_release(link);
kfree(link->priv);
}
......@@ -222,7 +220,7 @@ static int card_present(void *arg)
struct pcmcia_device *link = (struct pcmcia_device *)arg;
if (link->suspended)
return 0;
else if (link->state & DEV_PRESENT)
else if (pcmcia_dev_present(link))
return 1;
return 0;
......@@ -257,10 +255,7 @@ static int atmel_config(struct pcmcia_device *link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/*
In this loop, we scan the CIS for configuration table entries,
each of which describes a valid card configuration, including
......@@ -373,10 +368,9 @@ static int atmel_config(struct pcmcia_device *link)
strcpy(dev->node.dev_name, ((local_info_t*)link->priv)->eth_dev->name );
dev->node.major = dev->node.minor = 0;
link->dev_node = &dev->node;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
cs_error(link, last_fn, last_ret);
atmel_release(link);
......@@ -408,8 +402,7 @@ static int atmel_suspend(struct pcmcia_device *link)
{
local_info_t *local = link->priv;
if (link->state & DEV_CONFIG)
netif_device_detach(local->eth_dev);
netif_device_detach(local->eth_dev);
return 0;
}
......@@ -418,10 +411,8 @@ static int atmel_resume(struct pcmcia_device *link)
{
local_info_t *local = link->priv;
if (link->state & DEV_CONFIG) {
atmel_open(local->eth_dev);
netif_device_attach(local->eth_dev);
}
atmel_open(local->eth_dev);
netif_device_attach(local->eth_dev);
return 0;
}
......
drivers/net/wireless/hostap/hostap_cs.c
浏览文件 @ e2d40963
......@@ -210,9 +210,7 @@ static int prism2_config(struct pcmcia_device *link);
static int prism2_pccard_card_present(local_info_t *local)
{
struct hostap_cs_priv *hw_priv = local->hw_priv;
if (hw_priv != NULL && hw_priv->link != NULL &&
((hw_priv->link->state & (DEV_PRESENT | DEV_CONFIG)) ==
(DEV_PRESENT | DEV_CONFIG)))
if (hw_priv != NULL && hw_priv->link != NULL && DEV_OK(hw_priv->link))
return 1;
return 0;
}
......@@ -508,7 +506,6 @@ static int hostap_cs_probe(struct pcmcia_device *p_dev)
PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);
p_dev->conf.IntType = INT_MEMORY_AND_IO;
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
ret = prism2_config(p_dev);
if (ret) {
PDEBUG(DEBUG_EXTRA, "prism2_config() failed\n");
......@@ -522,9 +519,7 @@ static void prism2_detach(struct pcmcia_device *link)
{
PDEBUG(DEBUG_FLOW, "prism2_detach\n");
if (link->state & DEV_CONFIG) {
prism2_release((u_long)link);
}
prism2_release((u_long)link);
/* release net devices */
if (link->priv) {
......@@ -746,9 +741,6 @@ static int prism2_config(struct pcmcia_device *link)
link->io.BasePort2+link->io.NumPorts2-1);
printk("\n");
link->state |= DEV_CONFIG;
link->state &= ~DEV_CONFIG_PENDING;
local->shutdown = 0;
sandisk_enable_wireless(dev);
......@@ -784,8 +776,7 @@ static void prism2_release(u_long arg)
struct hostap_interface *iface;
iface = netdev_priv(dev);
if (link->state & DEV_CONFIG)
prism2_hw_shutdown(dev, 0);
prism2_hw_shutdown(dev, 0);
iface->local->shutdown = 1;
}
......@@ -797,19 +788,19 @@ static int hostap_cs_suspend(struct pcmcia_device *link)
{
struct net_device *dev = (struct net_device *) link->priv;
int dev_open = 0;
struct hostap_interface *iface = NULL;
PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
if (dev)
iface = netdev_priv(dev);
if (link->state & DEV_CONFIG) {
struct hostap_interface *iface = netdev_priv(dev);
if (iface && iface->local)
dev_open = iface->local->num_dev_open > 0;
if (dev_open) {
netif_stop_queue(dev);
netif_device_detach(dev);
}
prism2_suspend(dev);
PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
if (iface && iface->local)
dev_open = iface->local->num_dev_open > 0;
if (dev_open) {
netif_stop_queue(dev);
netif_device_detach(dev);
}
prism2_suspend(dev);
return 0;
}
......@@ -818,20 +809,21 @@ static int hostap_cs_resume(struct pcmcia_device *link)
{
struct net_device *dev = (struct net_device *) link->priv;
int dev_open = 0;
struct hostap_interface *iface = NULL;
if (dev)
iface = netdev_priv(dev);
PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
if (link->state & DEV_CONFIG) {
struct hostap_interface *iface = netdev_priv(dev);
if (iface && iface->local)
dev_open = iface->local->num_dev_open > 0;
if (iface && iface->local)
dev_open = iface->local->num_dev_open > 0;
prism2_hw_shutdown(dev, 1);
prism2_hw_config(dev, dev_open ? 0 : 1);
if (dev_open) {
netif_device_attach(dev);
netif_start_queue(dev);
}
prism2_hw_shutdown(dev, 1);
prism2_hw_config(dev, dev_open ? 0 : 1);
if (dev_open) {
netif_device_attach(dev);
netif_start_queue(dev);
}
return 0;
......
drivers/net/wireless/netwave_cs.c
浏览文件 @ e2d40963
......@@ -428,7 +428,6 @@ static int netwave_probe(struct pcmcia_device *link)
dev->stop = &netwave_close;
link->irq.Instance = dev;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return netwave_pcmcia_config( link);
} /* netwave_attach */
......@@ -446,8 +445,7 @@ static void netwave_detach(struct pcmcia_device *link)
DEBUG(0, "netwave_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
netwave_release(link);
netwave_release(link);
if (link->dev_node)
unregister_netdev(dev);
......@@ -763,9 +761,6 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/*
* Try allocating IO ports. This tries a few fixed addresses.
* If you want, you can also read the card's config table to
......@@ -823,7 +818,6 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
strcpy(priv->node.dev_name, dev->name);
link->dev_node = &priv->node;
link->state &= ~DEV_CONFIG_PENDING;
/* Reset card before reading physical address */
netwave_doreset(dev->base_addr, ramBase);
......@@ -875,7 +869,7 @@ static int netwave_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -885,7 +879,7 @@ static int netwave_resume(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
netwave_reset(dev);
netif_device_attach(dev);
}
......
drivers/net/wireless/orinoco_cs.c
浏览文件 @ e2d40963
......@@ -134,7 +134,6 @@ orinoco_cs_probe(struct pcmcia_device *link)
link->conf.Attributes = 0;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return orinoco_cs_config(link);
} /* orinoco_cs_attach */
......@@ -148,8 +147,7 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if (link->state & DEV_CONFIG)
orinoco_cs_release(link);
orinoco_cs_release(link);
DEBUG(0, PFX "detach: link=%p link->dev_node=%p\n", link, link->dev_node);
if (link->dev_node) {
......@@ -202,9 +200,6 @@ orinoco_cs_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/* Look up the current Vcc */
CS_CHECK(GetConfigurationInfo,
pcmcia_get_configuration_info(link, &conf));
......@@ -358,7 +353,6 @@ orinoco_cs_config(struct pcmcia_device *link)
link->dev_node = &card->node; /* link->dev_node being non-NULL is also
used to indicate that the
net_device has been registered */
link->state &= ~DEV_CONFIG_PENDING;
/* Finally, report what we've done */
printk(KERN_DEBUG "%s: index 0x%02x: ",
......@@ -416,23 +410,21 @@ static int orinoco_cs_suspend(struct pcmcia_device *link)
int err = 0;
unsigned long flags;
if (link->state & DEV_CONFIG) {
/* This is probably racy, but I can't think of
a better way, short of rewriting the PCMCIA
layer to not suck :-( */
if (! test_bit(0, &card->hard_reset_in_progress)) {
spin_lock_irqsave(&priv->lock, flags);
/* This is probably racy, but I can't think of
a better way, short of rewriting the PCMCIA
layer to not suck :-( */
if (! test_bit(0, &card->hard_reset_in_progress)) {
spin_lock_irqsave(&priv->lock, flags);
err = __orinoco_down(dev);
if (err)
printk(KERN_WARNING "%s: Error %d downing interface\n",
dev->name, err);
err = __orinoco_down(dev);
if (err)
printk(KERN_WARNING "%s: Error %d downing interface\n",
dev->name, err);
netif_device_detach(dev);
priv->hw_unavailable++;
netif_device_detach(dev);
priv->hw_unavailable++;
spin_unlock_irqrestore(&priv->lock, flags);
}
spin_unlock_irqrestore(&priv->lock, flags);
}
return 0;
......@@ -446,29 +438,27 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
int err = 0;
unsigned long flags;
if (link->state & DEV_CONFIG) {
if (! test_bit(0, &card->hard_reset_in_progress)) {
err = orinoco_reinit_firmware(dev);
if (err) {
printk(KERN_ERR "%s: Error %d re-initializing firmware\n",
dev->name, err);
return -EIO;
}
spin_lock_irqsave(&priv->lock, flags);
if (! test_bit(0, &card->hard_reset_in_progress)) {
err = orinoco_reinit_firmware(dev);
if (err) {
printk(KERN_ERR "%s: Error %d re-initializing firmware\n",
dev->name, err);
return -EIO;
}
netif_device_attach(dev);
priv->hw_unavailable--;
spin_lock_irqsave(&priv->lock, flags);
if (priv->open && ! priv->hw_unavailable) {
err = __orinoco_up(dev);
if (err)
printk(KERN_ERR "%s: Error %d restarting card\n",
dev->name, err);
}
netif_device_attach(dev);
priv->hw_unavailable--;
spin_unlock_irqrestore(&priv->lock, flags);
if (priv->open && ! priv->hw_unavailable) {
err = __orinoco_up(dev);
if (err)
printk(KERN_ERR "%s: Error %d restarting card\n",
dev->name, err);
}
spin_unlock_irqrestore(&priv->lock, flags);
}
return 0;
......
drivers/net/wireless/ray_cs.c
浏览文件 @ e2d40963
......@@ -366,7 +366,6 @@ static int ray_probe(struct pcmcia_device *p_dev)
init_timer(&local->timer);
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
this_device = p_dev;
return ray_config(p_dev);
......@@ -389,12 +388,10 @@ static void ray_detach(struct pcmcia_device *link)
this_device = NULL;
dev = link->priv;
if (link->state & DEV_CONFIG) {
ray_release(link);
ray_release(link);
local = (ray_dev_t *)dev->priv;
del_timer(&local->timer);
}
local = (ray_dev_t *)dev->priv;
del_timer(&local->timer);
if (link->priv) {
if (link->dev_node) unregister_netdev(dev);
......@@ -448,9 +445,6 @@ static int ray_config(struct pcmcia_device *link)
if (buf[i] == 0) buf[i] = ' ';
printk(KERN_INFO "ray_cs Detected: %s\n",buf);
/* Configure card */
link->state |= DEV_CONFIG;
/* Now allocate an interrupt line. Note that this does not
actually assign a handler to the interrupt.
*/
......@@ -511,7 +505,6 @@ static int ray_config(struct pcmcia_device *link)
strcpy(local->node.dev_name, dev->name);
link->dev_node = &local->node;
link->state &= ~DEV_CONFIG_PENDING;
printk(KERN_INFO "%s: RayLink, irq %d, hw_addr ",
dev->name, dev->irq);
for (i = 0; i < 6; i++)
......@@ -552,7 +545,7 @@ static int ray_init(struct net_device *dev)
ray_dev_t *local = (ray_dev_t *)dev->priv;
struct pcmcia_device *link = local->finder;
DEBUG(1, "ray_init(0x%p)\n", dev);
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(0,"ray_init - device not present\n");
return -1;
}
......@@ -615,7 +608,7 @@ static int dl_startup_params(struct net_device *dev)
struct pcmcia_device *link = local->finder;
DEBUG(1,"dl_startup_params entered\n");
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs dl_startup_params - device not present\n");
return -1;
}
......@@ -721,7 +714,7 @@ static void verify_dl_startup(u_long data)
UCHAR status;
struct pcmcia_device *link = local->finder;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs verify_dl_startup - device not present\n");
return;
}
......@@ -760,7 +753,7 @@ static void start_net(u_long data)
struct ccs __iomem *pccs;
int ccsindex;
struct pcmcia_device *link = local->finder;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs start_net - device not present\n");
return;
}
......@@ -788,7 +781,7 @@ static void join_net(u_long data)
int ccsindex;
struct pcmcia_device *link = local->finder;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs join_net - device not present\n");
return;
}
......@@ -839,7 +832,7 @@ static int ray_suspend(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -849,7 +842,7 @@ static int ray_resume(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
ray_reset(dev);
netif_device_attach(dev);
}
......@@ -867,7 +860,7 @@ int ray_dev_init(struct net_device *dev)
struct pcmcia_device *link = local->finder;
DEBUG(1,"ray_dev_init(dev=%p)\n",dev);
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_dev_init - device not present\n");
return -1;
}
......@@ -901,7 +894,7 @@ static int ray_dev_config(struct net_device *dev, struct ifmap *map)
struct pcmcia_device *link = local->finder;
/* Dummy routine to satisfy device structure */
DEBUG(1,"ray_dev_config(dev=%p,ifmap=%p)\n",dev,map);
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_dev_config - device not present\n");
return -1;
}
......@@ -915,7 +908,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct pcmcia_device *link = local->finder;
short length = skb->len;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_dev_start_xmit - device not present\n");
return -1;
}
......@@ -1542,7 +1535,7 @@ static iw_stats * ray_get_wireless_stats(struct net_device * dev)
}
#endif /* WIRELESS_SPY */
if((link->state & DEV_PRESENT)) {
if(pcmcia_dev_present(link)) {
local->wstats.qual.noise = readb(&p->rxnoise);
local->wstats.qual.updated |= 4;
}
......@@ -1674,7 +1667,7 @@ static int interrupt_ecf(ray_dev_t *local, int ccs)
int i = 50;
struct pcmcia_device *link = local->finder;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs interrupt_ecf - device not present\n");
return -1;
}
......@@ -1701,7 +1694,7 @@ static int get_free_tx_ccs(ray_dev_t *local)
struct ccs __iomem *pccs = ccs_base(local);
struct pcmcia_device *link = local->finder;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs get_free_tx_ccs - device not present\n");
return ECARDGONE;
}
......@@ -1732,7 +1725,7 @@ static int get_free_ccs(ray_dev_t *local)
struct ccs __iomem *pccs = ccs_base(local);
struct pcmcia_device *link = local->finder;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs get_free_ccs - device not present\n");
return ECARDGONE;
}
......@@ -1807,7 +1800,7 @@ static struct net_device_stats *ray_get_stats(struct net_device *dev)
ray_dev_t *local = (ray_dev_t *)dev->priv;
struct pcmcia_device *link = local->finder;
struct status __iomem *p = local->sram + STATUS_BASE;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs net_device_stats - device not present\n");
return &local->stats;
}
......@@ -1840,7 +1833,7 @@ static void ray_update_parm(struct net_device *dev, UCHAR objid, UCHAR *value, i
int i;
struct ccs __iomem *pccs;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_update_parm - device not present\n");
return;
}
......@@ -1875,7 +1868,7 @@ static void ray_update_multi_list(struct net_device *dev, int all)
struct pcmcia_device *link = local->finder;
void __iomem *p = local->sram + HOST_TO_ECF_BASE;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_update_multi_list - device not present\n");
return;
}
......@@ -1968,7 +1961,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->suspended ) {
if (!(pcmcia_dev_present(link)) || link->suspended ) {
DEBUG(2,"ray_cs interrupt from device not present or suspended.\n");
return IRQ_NONE;
}
......@@ -2489,7 +2482,7 @@ static void authenticate(ray_dev_t *local)
{
struct pcmcia_device *link = local->finder;
DEBUG(0,"ray_cs Starting authentication.\n");
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs authenticate - device not present\n");
return;
}
......@@ -2556,7 +2549,7 @@ static void associate(ray_dev_t *local)
struct pcmcia_device *link = local->finder;
struct net_device *dev = link->priv;
int ccsindex;
if (!(link->state & DEV_PRESENT)) {
if (!(pcmcia_dev_present(link))) {
DEBUG(2,"ray_cs associate - device not present\n");
return;
}
......
drivers/net/wireless/spectrum_cs.c
浏览文件 @ e2d40963
......@@ -245,7 +245,7 @@ spectrum_reset(struct pcmcia_device *link, int idle)
u_int save_cor;
/* Doing it if hardware is gone is guaranteed crash */
if (!(link->state & DEV_CONFIG))
if (pcmcia_dev_present(link))
return -ENODEV;
/* Save original COR value */
......@@ -613,7 +613,6 @@ spectrum_cs_probe(struct pcmcia_device *link)
link->conf.Attributes = 0;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return spectrum_cs_config(link);
} /* spectrum_cs_attach */
......@@ -627,8 +626,7 @@ static void spectrum_cs_detach(struct pcmcia_device *link)
{
struct net_device *dev = link->priv;
if (link->state & DEV_CONFIG)
spectrum_cs_release(link);
spectrum_cs_release(link);
DEBUG(0, PFX "detach: link=%p link->dev_node=%p\n", link, link->dev_node);
if (link->dev_node) {
......@@ -677,9 +675,6 @@ spectrum_cs_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/* Look up the current Vcc */
CS_CHECK(GetConfigurationInfo,
pcmcia_get_configuration_info(link, &conf));
......@@ -838,7 +833,6 @@ spectrum_cs_config(struct pcmcia_device *link)
link->dev_node = &card->node; /* link->dev_node being non-NULL is also
used to indicate that the
net_device has been registered */
link->state &= ~DEV_CONFIG_PENDING;
/* Finally, report what we've done */
printk(KERN_DEBUG "%s: index 0x%02x: ",
......@@ -898,19 +892,17 @@ spectrum_cs_suspend(struct pcmcia_device *link)
int err = 0;
/* Mark the device as stopped, to block IO until later */
if (link->state & DEV_CONFIG) {
spin_lock_irqsave(&priv->lock, flags);
spin_lock_irqsave(&priv->lock, flags);
err = __orinoco_down(dev);
if (err)
printk(KERN_WARNING "%s: Error %d downing interface\n",
dev->name, err);
err = __orinoco_down(dev);
if (err)
printk(KERN_WARNING "%s: Error %d downing interface\n",
dev->name, err);
netif_device_detach(dev);
priv->hw_unavailable++;
netif_device_detach(dev);
priv->hw_unavailable++;
spin_unlock_irqrestore(&priv->lock, flags);
}
spin_unlock_irqrestore(&priv->lock, flags);
return 0;
}
......@@ -921,11 +913,10 @@ spectrum_cs_resume(struct pcmcia_device *link)
struct net_device *dev = link->priv;
struct orinoco_private *priv = netdev_priv(dev);
if (link->state & DEV_CONFIG) {
netif_device_attach(dev);
priv->hw_unavailable--;
schedule_work(&priv->reset_work);
}
netif_device_attach(dev);
priv->hw_unavailable--;
schedule_work(&priv->reset_work);
return 0;
}
......
drivers/net/wireless/wavelan_cs.c
浏览文件 @ e2d40963
......@@ -3983,12 +3983,9 @@ wv_pcmcia_config(struct pcmcia_device * link)
if(i != CS_SUCCESS)
{
cs_error(link, ParseTuple, i);
link->state &= ~DEV_CONFIG_PENDING;
return FALSE;
}
/* Configure card */
link->state |= DEV_CONFIG;
do
{
i = pcmcia_request_io(link, &link->io);
......@@ -4071,7 +4068,6 @@ wv_pcmcia_config(struct pcmcia_device * link)
}
while(0); /* Humm... Disguised goto !!! */
link->state &= ~DEV_CONFIG_PENDING;
/* If any step failed, release any partially configured state */
if(i != 0)
{
......@@ -4651,7 +4647,6 @@ wavelan_probe(struct pcmcia_device *p_dev)
/* Other specific data */
dev->mtu = WAVELAN_MTU;
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
ret = wv_pcmcia_config(p_dev);
if (ret)
return ret;
......@@ -4686,17 +4681,8 @@ wavelan_detach(struct pcmcia_device *link)
printk(KERN_DEBUG "-> wavelan_detach(0x%p)\n", link);
#endif
/*
* If the device is currently configured and active, we won't
* actually delete it yet. Instead, it is marked so that when the
* release() function is called, that will trigger a proper
* detach().
*/
if(link->state & DEV_CONFIG)
{
/* Some others haven't done their job : give them another chance */
wv_pcmcia_release(link);
}
/* Some others haven't done their job : give them another chance */
wv_pcmcia_release(link);
/* Free pieces */
if(link->priv)
......@@ -4731,7 +4717,7 @@ static int wavelan_suspend(struct pcmcia_device *link)
/* Stop receiving new messages and wait end of transmission */
wv_ru_stop(dev);
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
/* Power down the module */
......@@ -4744,7 +4730,7 @@ static int wavelan_resume(struct pcmcia_device *link)
{
struct net_device * dev = (struct net_device *) link->priv;
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
wv_hw_reset(dev);
netif_device_attach(dev);
}
......
drivers/net/wireless/wl3501_cs.c
浏览文件 @ e2d40963
......@@ -1485,13 +1485,11 @@ static void wl3501_detach(struct pcmcia_device *link)
* delete it yet. Instead, it is marked so that when the release()
* function is called, that will trigger a proper detach(). */
if (link->state & DEV_CONFIG) {
while (link->open > 0)
wl3501_close(dev);
while (link->open > 0)
wl3501_close(dev);
netif_device_detach(dev);
wl3501_release(link);
}
netif_device_detach(dev);
wl3501_release(link);
if (link->priv)
free_netdev(link->priv);
......@@ -1959,7 +1957,6 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
netif_stop_queue(dev);
p_dev->priv = p_dev->irq.Instance = dev;
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return wl3501_config(p_dev);
out_link:
return -ENOMEM;
......@@ -1997,9 +1994,6 @@ static int wl3501_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/* Try allocating IO ports. This tries a few fixed addresses. If you
* want, you can also read the card's config table to pick addresses --
* see the serial driver for an example. */
......@@ -2044,7 +2038,6 @@ static int wl3501_config(struct pcmcia_device *link)
* arranged in a linked list at link->dev_node.
*/
link->dev_node = &this->node;
link->state &= ~DEV_CONFIG_PENDING;
this->base_addr = dev->base_addr;
......@@ -2113,7 +2106,7 @@ static int wl3501_suspend(struct pcmcia_device *link)
struct net_device *dev = link->priv;
wl3501_pwr_mgmt(dev->priv, WL3501_SUSPEND);
if ((link->state & DEV_CONFIG) && (link->open))
if (link->open)
netif_device_detach(dev);
return 0;
......@@ -2124,7 +2117,7 @@ static int wl3501_resume(struct pcmcia_device *link)
struct net_device *dev = link->priv;
wl3501_pwr_mgmt(dev->priv, WL3501_RESUME);
if ((link->state & DEV_CONFIG) && (link->open)) {
if (link->open) {
wl3501_reset(dev);
netif_device_attach(dev);
}
......
drivers/parport/parport_cs.c
浏览文件 @ e2d40963
......@@ -119,7 +119,6 @@ static int parport_probe(struct pcmcia_device *link)
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return parport_config(link);
} /* parport_attach */
......@@ -136,8 +135,7 @@ static void parport_detach(struct pcmcia_device *link)
{
DEBUG(0, "parport_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
parport_cs_release(link);
parport_cs_release(link);
kfree(link->priv);
} /* parport_detach */
......@@ -175,9 +173,6 @@ static int parport_config(struct pcmcia_device *link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
tuple.Attributes = 0;
......@@ -233,14 +228,12 @@ static int parport_config(struct pcmcia_device *link)
strcpy(info->node.dev_name, p->name);
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
cs_error(link, last_fn, last_ret);
failed:
parport_cs_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
} /* parport_config */
......
drivers/pcmcia/cs_internal.h
浏览文件 @ e2d40963
......@@ -23,7 +23,7 @@
#define CLIENT_IO_REQ 0x0004
#define CLIENT_UNBOUND 0x0008
#define CLIENT_STALE 0x0010
#define CLIENT_WIN_REQ(i) (0x20<<(i))
#define CLIENT_WIN_REQ(i) (0x1<<(i))
#define CLIENT_CARDBUS 0x8000
#define REGION_MAGIC 0xE3C9
......
drivers/pcmcia/ds.c
浏览文件 @ e2d40963
......@@ -390,8 +390,6 @@ static int pcmcia_device_probe(struct device * dev)
goto put_dev;
}
p_dev->p_state &= ~CLIENT_UNBOUND;
ret = p_drv->probe(p_dev);
if (ret)
goto put_module;
......@@ -433,17 +431,16 @@ static int pcmcia_device_remove(struct device * dev)
p_drv->remove(p_dev);
/* check for proper unloading */
if (p_dev->p_state & (CLIENT_IRQ_REQ|CLIENT_IO_REQ|CLIENT_CONFIG_LOCKED))
if (p_dev->_irq || p_dev->_io || p_dev->_locked)
printk(KERN_INFO "pcmcia: driver %s did not release config properly\n",
p_drv->drv.name);
for (i = 0; i < MAX_WIN; i++)
if (p_dev->p_state & CLIENT_WIN_REQ(i))
if (p_dev->_win & CLIENT_WIN_REQ(i))
printk(KERN_INFO "pcmcia: driver %s did not release windows properly\n",
p_drv->drv.name);
/* references from pcmcia_probe_device */
p_dev->p_state = CLIENT_UNBOUND;
pcmcia_put_dev(p_dev);
module_put(p_drv->owner);
......@@ -472,7 +469,6 @@ static void pcmcia_card_remove(struct pcmcia_socket *s)
}
p_dev = list_entry((&s->devices_list)->next, struct pcmcia_device, socket_device_list);
list_del(&p_dev->socket_device_list);
p_dev->p_state |= CLIENT_STALE;
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
device_unregister(&p_dev->dev);
......@@ -602,9 +598,6 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
sprintf (p_dev->devname, "pcmcia%s", p_dev->dev.bus_id);
/* compat */
p_dev->p_state = CLIENT_UNBOUND;
spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
/*
......@@ -1033,15 +1026,18 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
if (dev->driver)
p_drv = to_pcmcia_drv(dev->driver);
if (p_drv && p_drv->suspend) {
if (!p_drv)
goto out;
if (p_drv->suspend) {
ret = p_drv->suspend(p_dev);
if (ret)
goto out;
if ((p_dev->state & DEV_CONFIG) &&
!(p_dev->state & DEV_SUSPEND_NORELEASE))
pcmcia_release_configuration(p_dev);
}
if (p_dev->device_no == p_dev->func)
pcmcia_release_configuration(p_dev);
out:
if (!ret)
p_dev->suspended = 1;
......@@ -1058,17 +1054,18 @@ static int pcmcia_dev_resume(struct device * dev)
if (dev->driver)
p_drv = to_pcmcia_drv(dev->driver);
if (p_drv && p_drv->resume) {
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);
if (!p_drv)
goto out;
if (p_dev->device_no == p_dev->func) {
ret = pcmcia_request_configuration(p_dev, &p_dev->conf);
if (ret)
goto out;
}
if (p_drv->resume)
ret = p_drv->resume(p_dev);
out:
if (!ret)
p_dev->suspended = 0;
......
drivers/pcmcia/pcmcia_ioctl.c
浏览文件 @ e2d40963
......@@ -304,6 +304,7 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int
{
dev_node_t *node;
struct pcmcia_device *p_dev;
struct pcmcia_driver *p_drv;
unsigned long flags;
int ret = 0;
......@@ -358,7 +359,8 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int
found:
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
if (p_dev->state & DEV_CONFIG_PENDING) {
p_drv = to_pcmcia_drv(p_dev->dev.driver);
if (p_drv && !p_dev->_locked) {
ret = -EAGAIN;
goto err_put;
}
......
drivers/pcmcia/pcmcia_resource.c
浏览文件 @ e2d40963
......@@ -476,8 +476,8 @@ int pcmcia_release_configuration(struct pcmcia_device *p_dev)
config_t *c = p_dev->function_config;
int i;
if (p_dev->p_state & CLIENT_CONFIG_LOCKED) {
p_dev->p_state &= ~CLIENT_CONFIG_LOCKED;
if (p_dev->_locked) {
p_dev->_locked = 0;
if (--(s->lock_count) == 0) {
s->socket.flags = SS_OUTPUT_ENA; /* Is this correct? */
s->socket.Vpp = 0;
......@@ -516,10 +516,10 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)
struct pcmcia_socket *s = p_dev->socket;
config_t *c = p_dev->function_config;
if (!(p_dev->p_state & CLIENT_IO_REQ))
if (!p_dev->_io )
return CS_BAD_HANDLE;
p_dev->p_state &= ~CLIENT_IO_REQ;
p_dev->_io = 0;
if ((c->io.BasePort1 != req->BasePort1) ||
(c->io.NumPorts1 != req->NumPorts1) ||
......@@ -542,9 +542,9 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
struct pcmcia_socket *s = p_dev->socket;
config_t *c= p_dev->function_config;
if (!(p_dev->p_state & CLIENT_IRQ_REQ))
if (!p_dev->_irq)
return CS_BAD_HANDLE;
p_dev->p_state &= ~CLIENT_IRQ_REQ;
p_dev->_irq = 0;
if (c->state & CONFIG_LOCKED)
return CS_CONFIGURATION_LOCKED;
......@@ -576,7 +576,7 @@ int pcmcia_release_window(window_handle_t win)
if ((win == NULL) || (win->magic != WINDOW_MAGIC))
return CS_BAD_HANDLE;
s = win->sock;
if (!(win->handle->p_state & CLIENT_WIN_REQ(win->index)))
if (!(win->handle->_win & CLIENT_WIN_REQ(win->index)))
return CS_BAD_HANDLE;
/* Shut down memory window */
......@@ -590,7 +590,7 @@ int pcmcia_release_window(window_handle_t win)
kfree(win->ctl.res);
win->ctl.res = NULL;
}
win->handle->p_state &= ~CLIENT_WIN_REQ(win->index);
win->handle->_win &= ~CLIENT_WIN_REQ(win->index);
win->magic = 0;
......@@ -708,7 +708,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
}
c->state |= CONFIG_LOCKED;
p_dev->p_state |= CLIENT_CONFIG_LOCKED;
p_dev->_locked = 1;
return CS_SUCCESS;
} /* pcmcia_request_configuration */
EXPORT_SYMBOL(pcmcia_request_configuration);
......@@ -754,7 +754,7 @@ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req)
c->io = *req;
c->state |= CONFIG_IO_REQ;
p_dev->p_state |= CLIENT_IO_REQ;
p_dev->_io = 1;
return CS_SUCCESS;
} /* pcmcia_request_io */
EXPORT_SYMBOL(pcmcia_request_io);
......@@ -850,7 +850,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
s->irq.Config++;
c->state |= CONFIG_IRQ_REQ;
p_dev->p_state |= CLIENT_IRQ_REQ;
p_dev->_irq = 1;
#ifdef CONFIG_PCMCIA_PROBE
pcmcia_used_irq[irq]++;
......@@ -910,7 +910,7 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
if (!win->ctl.res)
return CS_IN_USE;
}
(*p_dev)->p_state |= CLIENT_WIN_REQ(w);
(*p_dev)->_win |= CLIENT_WIN_REQ(w);
/* Configure the socket controller */
win->ctl.map = w+1;
......
drivers/scsi/pcmcia/aha152x_stub.c
浏览文件 @ e2d40963
......@@ -122,7 +122,6 @@ static int aha152x_probe(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Present = PRESENT_OPTION;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return aha152x_config_cs(link);
} /* aha152x_attach */
......@@ -132,8 +131,7 @@ static void aha152x_detach(struct pcmcia_device *link)
{
DEBUG(0, "aha152x_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
aha152x_release_cs(link);
aha152x_release_cs(link);
/* Unlink device structure, free bits */
kfree(link->priv);
......@@ -165,9 +163,6 @@ static int aha152x_config_cs(struct pcmcia_device *link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
/* Configure card */
link->state |= DEV_CONFIG;
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
while (1) {
......@@ -216,7 +211,6 @@ static int aha152x_config_cs(struct pcmcia_device *link)
link->dev_node = &info->node;
info->host = host;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
......
drivers/scsi/pcmcia/fdomain_stub.c
浏览文件 @ e2d40963
......@@ -105,7 +105,6 @@ static int fdomain_probe(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Present = PRESENT_OPTION;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return fdomain_config(link);
} /* fdomain_attach */
......@@ -115,8 +114,7 @@ static void fdomain_detach(struct pcmcia_device *link)
{
DEBUG(0, "fdomain_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
fdomain_release(link);
fdomain_release(link);
kfree(link->priv);
} /* fdomain_detach */
......@@ -147,9 +145,6 @@ static int fdomain_config(struct pcmcia_device *link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
/* Configure card */
link->state |= DEV_CONFIG;
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
while (1) {
......@@ -188,7 +183,6 @@ static int fdomain_config(struct pcmcia_device *link)
link->dev_node = &info->node;
info->host = host;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
......@@ -214,8 +208,7 @@ static void fdomain_release(struct pcmcia_device *link)
static int fdomain_resume(struct pcmcia_device *link)
{
if (link->state & DEV_CONFIG)
fdomain_16x0_bus_reset(NULL);
fdomain_16x0_bus_reset(NULL);
return 0;
}
......
drivers/scsi/pcmcia/nsp_cs.c
浏览文件 @ e2d40963
......@@ -1630,7 +1630,6 @@ static int nsp_cs_probe(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Present = PRESENT_OPTION;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
ret = nsp_cs_config(link);
nsp_dbg(NSP_DEBUG_INIT, "link=0x%p", link);
......@@ -1648,10 +1647,8 @@ static void nsp_cs_detach(struct pcmcia_device *link)
{
nsp_dbg(NSP_DEBUG_INIT, "in, link=0x%p", link);
if (link->state & DEV_CONFIG) {
((scsi_info_t *)link->priv)->stop = 1;
nsp_cs_release(link);
}
((scsi_info_t *)link->priv)->stop = 1;
nsp_cs_release(link);
kfree(link->priv);
link->priv = NULL;
......@@ -1698,9 +1695,6 @@ static int nsp_cs_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/* Look up the current Vcc */
CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &conf));
......@@ -1921,7 +1915,6 @@ static int nsp_cs_config(struct pcmcia_device *link)
req.Base+req.Size-1);
printk("\n");
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
......@@ -2071,19 +2064,7 @@ static int __init nsp_cs_init(void)
static void __exit nsp_cs_exit(void)
{
nsp_msg(KERN_INFO, "unloading...");
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,68))
pcmcia_unregister_driver(&nsp_driver);
#else
unregister_pcmcia_driver(&dev_info);
/* XXX: this really needs to move into generic code.. */
while (dev_list != NULL) {
if (dev_list->state & DEV_CONFIG) {
nsp_cs_release(dev_list);
}
nsp_cs_detach(dev_list);
}
#endif
}
......
drivers/scsi/pcmcia/qlogic_stub.c
浏览文件 @ e2d40963
......@@ -178,7 +178,6 @@ static int qlogic_probe(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Present = PRESENT_OPTION;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return qlogic_config(link);
} /* qlogic_attach */
......@@ -188,9 +187,7 @@ static void qlogic_detach(struct pcmcia_device *link)
{
DEBUG(0, "qlogic_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
qlogic_release(link);
qlogic_release(link);
kfree(link->priv);
} /* qlogic_detach */
......@@ -224,9 +221,6 @@ static int qlogic_config(struct pcmcia_device * link)
if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) && (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS))
info->manf_id = le16_to_cpu(tuple.TupleData[0]);
/* Configure card */
link->state |= DEV_CONFIG;
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
while (1) {
......@@ -272,7 +266,6 @@ static int qlogic_config(struct pcmcia_device * link)
link->dev_node = &info->node;
info->host = host;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
......@@ -302,20 +295,18 @@ static void qlogic_release(struct pcmcia_device *link)
static int qlogic_resume(struct pcmcia_device *link)
{
if (link->state & DEV_CONFIG) {
scsi_info_t *info = link->priv;
pcmcia_request_configuration(link, &link->conf);
if ((info->manf_id == MANFID_MACNICA) ||
(info->manf_id == MANFID_PIONEER) ||
(info->manf_id == 0x0098)) {
outb(0x80, link->io.BasePort1 + 0xd);
outb(0x24, link->io.BasePort1 + 0x9);
outb(0x04, link->io.BasePort1 + 0xd);
}
/* Ugggglllyyyy!!! */
qlogicfas408_bus_reset(NULL);
scsi_info_t *info = link->priv;
pcmcia_request_configuration(link, &link->conf);
if ((info->manf_id == MANFID_MACNICA) ||
(info->manf_id == MANFID_PIONEER) ||
(info->manf_id == 0x0098)) {
outb(0x80, link->io.BasePort1 + 0xd);
outb(0x24, link->io.BasePort1 + 0x9);
outb(0x04, link->io.BasePort1 + 0xd);
}
/* Ugggglllyyyy!!! */
qlogicfas408_bus_reset(NULL);
return 0;
}
......
drivers/scsi/pcmcia/sym53c500_cs.c
浏览文件 @ e2d40963
......@@ -736,9 +736,6 @@ SYM53C500_config(struct pcmcia_device *link)
(pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS))
info->manf_id = le16_to_cpu(tuple.TupleData[0]);
/* Configure card */
link->state |= DEV_CONFIG;
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
while (1) {
......@@ -836,7 +833,6 @@ SYM53C500_config(struct pcmcia_device *link)
scsi_scan_host(host);
link->state &= ~DEV_CONFIG_PENDING;
return 0;
err_free_irq:
......@@ -846,7 +842,6 @@ SYM53C500_config(struct pcmcia_device *link)
err_release:
release_region(port_base, 0x10);
printk(KERN_INFO "sym53c500_cs: no SCSI devices found\n");
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
cs_failed:
......@@ -859,21 +854,19 @@ static int sym53c500_resume(struct pcmcia_device *link)
{
struct scsi_info_t *info = link->priv;
if (link->state & DEV_CONFIG) {
/* See earlier comment about manufacturer IDs. */
if ((info->manf_id == MANFID_MACNICA) ||
(info->manf_id == MANFID_PIONEER) ||
(info->manf_id == 0x0098)) {
outb(0x80, link->io.BasePort1 + 0xd);
outb(0x24, link->io.BasePort1 + 0x9);
outb(0x04, link->io.BasePort1 + 0xd);
}
/*
* If things don't work after a "resume",
* this is a good place to start looking.
*/
SYM53C500_int_host_reset(link->io.BasePort1);
/* See earlier comment about manufacturer IDs. */
if ((info->manf_id == MANFID_MACNICA) ||
(info->manf_id == MANFID_PIONEER) ||
(info->manf_id == 0x0098)) {
outb(0x80, link->io.BasePort1 + 0xd);
outb(0x24, link->io.BasePort1 + 0x9);
outb(0x04, link->io.BasePort1 + 0xd);
}
/*
* If things don't work after a "resume",
* this is a good place to start looking.
*/
SYM53C500_int_host_reset(link->io.BasePort1);
return 0;
}
......@@ -883,8 +876,7 @@ SYM53C500_detach(struct pcmcia_device *link)
{
DEBUG(0, "SYM53C500_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
SYM53C500_release(link);
SYM53C500_release(link);
kfree(link->priv);
link->priv = NULL;
......@@ -913,7 +905,6 @@ SYM53C500_probe(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Present = PRESENT_OPTION;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return SYM53C500_config(link);
} /* SYM53C500_attach */
......
drivers/serial/serial_cs.c
浏览文件 @ e2d40963
......@@ -128,38 +128,27 @@ static void serial_remove(struct pcmcia_device *link)
struct serial_info *info = link->priv;
int i;
link->state &= ~DEV_PRESENT;
DEBUG(0, "serial_release(0x%p)\n", link);
/*
* Recheck to see if the device is still configured.
*/
if (info->p_dev->state & DEV_CONFIG) {
for (i = 0; i < info->ndev; i++)
serial8250_unregister_port(info->line[i]);
info->p_dev->dev_node = NULL;
for (i = 0; i < info->ndev; i++)
serial8250_unregister_port(info->line[i]);
if (!info->slave)
pcmcia_disable_device(link);
info->p_dev->dev_node = NULL;
info->p_dev->state &= ~DEV_CONFIG;
}
if (!info->slave)
pcmcia_disable_device(link);
}
static int serial_suspend(struct pcmcia_device *link)
{
if (link->state & DEV_CONFIG) {
struct serial_info *info = link->priv;
int i;
for (i = 0; i < info->ndev; i++)
serial8250_suspend_port(info->line[i]);
struct serial_info *info = link->priv;
int i;
if (info->slave)
link->state &= DEV_SUSPEND_NORELEASE;
}
for (i = 0; i < info->ndev; i++)
serial8250_suspend_port(info->line[i]);
return 0;
}
......@@ -210,7 +199,6 @@ static int serial_probe(struct pcmcia_device *link)
}
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return serial_config(link);
}
......@@ -586,9 +574,6 @@ static int serial_config(struct pcmcia_device * link)
link->conf.ConfigBase = parse->config.base;
link->conf.Present = parse->config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/* Is this a compliant multifunction card? */
tuple->DesiredTuple = CISTPL_LONGLINK_MFC;
tuple->Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;
......@@ -648,7 +633,6 @@ static int serial_config(struct pcmcia_device * link)
}
link->dev_node = &info->node[0];
link->state &= ~DEV_CONFIG_PENDING;
kfree(cfg_mem);
return 0;
......@@ -656,7 +640,6 @@ static int serial_config(struct pcmcia_device * link)
cs_error(link, last_fn, last_ret);
failed:
serial_remove(link);
link->state &= ~DEV_CONFIG_PENDING;
kfree(cfg_mem);
return -ENODEV;
}
......
drivers/telephony/ixj_pcmcia.c
浏览文件 @ e2d40963
......@@ -52,7 +52,6 @@ static int ixj_probe(struct pcmcia_device *p_dev)
}
memset(p_dev->priv, 0, sizeof(struct ixj_info_t));
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return ixj_config(p_dev);
}
......@@ -60,8 +59,7 @@ static void ixj_detach(struct pcmcia_device *link)
{
DEBUG(0, "ixj_detach(0x%p)\n", link);
if (link->state & DEV_CONFIG)
ixj_cs_release(link);
ixj_cs_release(link);
kfree(link->priv);
}
......@@ -155,7 +153,6 @@ static int ixj_config(struct pcmcia_device * link)
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
link->state |= DEV_CONFIG;
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
tuple.Attributes = 0;
CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
......@@ -194,7 +191,6 @@ static int ixj_config(struct pcmcia_device * link)
info->node.major = PHONE_MAJOR;
link->dev_node = &info->node;
ixj_get_serial(link, j);
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
cs_error(link, last_fn, last_ret);
......
drivers/usb/host/sl811_cs.c
浏览文件 @ e2d40963
......@@ -142,9 +142,7 @@ static void sl811_cs_detach(struct pcmcia_device *link)
{
DBG(0, "sl811_cs_detach(0x%p)\n", link);
link->state &= ~DEV_PRESENT;
if (link->state & DEV_CONFIG)
sl811_cs_release(link);
sl811_cs_release(link);
/* This points to the parent local_info_t struct */
kfree(link->priv);
......@@ -182,9 +180,6 @@ static int sl811_cs_config(struct pcmcia_device *link)
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
/* Configure card */
link->state |= DEV_CONFIG;
/* Look up the current Vcc */
CS_CHECK(GetConfigurationInfo,
pcmcia_get_configuration_info(link, &conf));
......@@ -276,15 +271,12 @@ static int sl811_cs_config(struct pcmcia_device *link)
link->io.BasePort1+link->io.NumPorts1-1);
printk("\n");
link->state &= ~DEV_CONFIG_PENDING;
if (sl811_hc_init(parent, link->io.BasePort1, link->irq.AssignedIRQ)
< 0) {
cs_failed:
printk("sl811_cs_config failed\n");
cs_error(link, last_fn, last_ret);
sl811_cs_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
}
return 0;
......@@ -309,7 +301,6 @@ static int sl811_cs_probe(struct pcmcia_device *link)
link->conf.Attributes = 0;
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
return sl811_cs_config(link);
}
......
include/pcmcia/ds.h
浏览文件 @ e2d40963
......@@ -96,6 +96,7 @@ typedef union ds_ioctl_arg_t {
#ifdef __KERNEL__
#include <linux/device.h>
#include <pcmcia/ss.h>
typedef struct dev_node_t {
char dev_name[DEV_NAME_LEN];
......@@ -103,15 +104,11 @@ typedef struct dev_node_t {
struct dev_node_t *next;
} dev_node_t;
/* Flags for device state */
#define DEV_PRESENT 0x01
#define DEV_CONFIG 0x02
#define DEV_SUSPEND_NORELEASE 0x04
#define DEV_CONFIG_PENDING 0x10
#define DEV_BUSY 0x80
#define pcmcia_dev_present(p_dev) \
(p_dev->socket->pcmcia_state.present)
#define DEV_OK(l) \
((l) && ((l->state & ~DEV_BUSY) == (DEV_CONFIG|DEV_PRESENT)))
((l) && (!l->suspended) && pcmcia_dev_present(l))
struct pcmcia_socket;
......@@ -133,6 +130,7 @@ struct pcmcia_driver {
int pcmcia_register_driver(struct pcmcia_driver *driver);
void pcmcia_unregister_driver(struct pcmcia_driver *driver);
struct pcmcia_device {
/* the socket and the device_no [for multifunction devices]
uniquely define a pcmcia_device */
......@@ -151,25 +149,32 @@ struct pcmcia_device {
/* deprecated, will be cleaned up soon */
dev_node_t *dev_node;
u_int state;
u_int open;
io_req_t io;
irq_req_t irq;
config_req_t conf;
window_handle_t win;
void *priv;
u_int p_state;
/* Is the device suspended? */
u16 suspended:1;
/* Flags whether io, irq, win configurations were
* requested, and whether the configuration is "locked" */
u16 _irq:1;
u16 _io:1;
u16 _win:4;
u16 _locked:1;
u8 suspended:1;
u8 reserved:3;
/* Flag whether a "fuzzy" func_id based match is
* allowed. */
u16 allow_func_id_match:1;
/* information about this device */
u8 has_manf_id:1;
u8 has_card_id:1;
u8 has_func_id:1;
u16 has_manf_id:1;
u16 has_card_id:1;
u16 has_func_id:1;
u8 allow_func_id_match:1;
u16 reserved:4;
u8 func_id;
u16 manf_id;
......@@ -183,6 +188,9 @@ struct pcmcia_device {
/* device driver wanted by cardmgr */
struct pcmcia_driver * cardmgr;
#endif
/* data private to drivers */
void *priv;
};
#define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev)
......
sound/pcmcia/pdaudiocf/pdaudiocf.c
浏览文件 @ e2d40963
......@@ -243,9 +243,6 @@ static int pdacf_config(struct pcmcia_device *link)
link->conf.ConfigIndex = 0x5;
kfree(parse);
/* 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));
......@@ -254,7 +251,6 @@ static int pdacf_config(struct pcmcia_device *link)
goto failed;
link->dev_node = &pdacf->node;
link->state &= ~DEV_CONFIG_PENDING;
return 0;
cs_failed:
......
sound/pcmcia/vx/vxpocket.c
浏览文件 @ e2d40963
......@@ -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);
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或