[PATCH] PCMCIA: fix drivers broken by recent cleanup
Setting .ConfigBase and .Present is now done at the pcmcia core. The driver cleanup missed a few places where the driver did set .Present to PRESENT_OPTION and later to the values from the CIS. Setting to PRESENT_OPTION now overrides the values from the CIS. So just remove those lines. Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
aae7d14f61
commit
e176d397ad
|
@ -281,7 +281,6 @@ static int tc574_probe(struct pcmcia_device *link)
|
|||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||
link->conf.ConfigIndex = 1;
|
||||
link->conf.Present = PRESENT_OPTION;
|
||||
|
||||
/* The EL3-specific entries in the device structure. */
|
||||
dev->hard_start_xmit = &el3_start_xmit;
|
||||
|
|
|
@ -195,7 +195,6 @@ static int tc589_probe(struct pcmcia_device *link)
|
|||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||
link->conf.ConfigIndex = 1;
|
||||
link->conf.Present = PRESENT_OPTION;
|
||||
|
||||
/* The EL3-specific entries in the device structure. */
|
||||
SET_MODULE_OWNER(dev);
|
||||
|
|
|
@ -173,7 +173,6 @@ static int com20020_probe(struct pcmcia_device *p_dev)
|
|||
p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
||||
p_dev->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
p_dev->conf.IntType = INT_MEMORY_AND_IO;
|
||||
p_dev->conf.Present = PRESENT_OPTION;
|
||||
|
||||
p_dev->irq.Instance = info->dev = dev;
|
||||
p_dev->priv = info;
|
||||
|
|
|
@ -576,7 +576,6 @@ xirc2ps_probe(struct pcmcia_device *link)
|
|||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||
link->conf.ConfigIndex = 1;
|
||||
link->conf.Present = PRESENT_OPTION;
|
||||
link->irq.Handler = xirc2ps_interrupt;
|
||||
link->irq.Instance = dev;
|
||||
|
||||
|
|
|
@ -406,7 +406,6 @@ static int netwave_probe(struct pcmcia_device *link)
|
|||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||
link->conf.ConfigIndex = 1;
|
||||
link->conf.Present = PRESENT_OPTION;
|
||||
|
||||
/* Netwave private struct init. link/dev/node already taken care of,
|
||||
* other stuff zero'd - Jean II */
|
||||
|
|
|
@ -331,7 +331,6 @@ static int ray_probe(struct pcmcia_device *p_dev)
|
|||
p_dev->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
p_dev->conf.IntType = INT_MEMORY_AND_IO;
|
||||
p_dev->conf.ConfigIndex = 1;
|
||||
p_dev->conf.Present = PRESENT_OPTION;
|
||||
|
||||
p_dev->priv = dev;
|
||||
p_dev->irq.Instance = dev;
|
||||
|
|
|
@ -1928,7 +1928,6 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
|
|||
p_dev->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
p_dev->conf.IntType = INT_MEMORY_AND_IO;
|
||||
p_dev->conf.ConfigIndex = 1;
|
||||
p_dev->conf.Present = PRESENT_OPTION;
|
||||
|
||||
dev = alloc_etherdev(sizeof(struct wl3501_card));
|
||||
if (!dev)
|
||||
|
|
|
@ -1629,7 +1629,6 @@ static int nsp_cs_probe(struct pcmcia_device *link)
|
|||
/* General socket configuration */
|
||||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||
link->conf.Present = PRESENT_OPTION;
|
||||
|
||||
ret = nsp_cs_config(link);
|
||||
|
||||
|
|
|
@ -895,7 +895,6 @@ SYM53C500_probe(struct pcmcia_device *link)
|
|||
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
||||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||
link->conf.Present = PRESENT_OPTION;
|
||||
|
||||
return SYM53C500_config(link);
|
||||
} /* SYM53C500_attach */
|
||||
|
|
Loading…
Reference in a new issue