Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e176d397 authored by Daniel Ritz's avatar Daniel Ritz Committed by Linus Torvalds
Browse files

[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: default avatarDaniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent aae7d14f

drivers/net/pcmcia/3c574_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/pcmcia/3c589_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/pcmcia/com20020_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/pcmcia/xirc2ps_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/netwave_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */