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

Commit 5e7bf8cc authored by Komuro's avatar Komuro Committed by Jeff Garzik
Browse files

netdrvr/pcmcia: use IRQ_TYPE_DYNAMIC_SHARING flag for irq.Attributes. 



The drivers below support IRQ-sharing.

3c574_cs, 3c589_cs, pcnet_cs,
axnet_cs, smc91c92_cs, fmvj18x_cs.
xirc2ps_cs, serial_cs.

Signed-off-by: default avatarKomuro <komurojun-mbn@nifty.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5d031e9e

drivers/net/pcmcia/3c574_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static int tc574_probe(struct pcmcia_device *link) 
	spin_lock_init(&lp->window_lock);

	link->io.NumPorts1 = 32;

	link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;

	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT;

	link->irq.IRQInfo1 = IRQ_LEVEL_ID;

	link->irq.Handler = &el3_interrupt;

	link->irq.Instance = dev;

drivers/net/pcmcia/3c589_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int tc589_probe(struct pcmcia_device *link) 
    spin_lock_init(&lp->lock);

    link->io.NumPorts1 = 16;

    link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;

    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;

    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT;

    link->irq.IRQInfo1 = IRQ_LEVEL_ID;

    link->irq.Handler = &el3_interrupt;

    link->irq.Instance = dev;

drivers/net/pcmcia/axnet_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int axnet_probe(struct pcmcia_device *link) 
    info = PRIV(dev);

    info->p_dev = link;

    link->priv = dev;

    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;

    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

    link->irq.IRQInfo1 = IRQ_LEVEL_ID;

    link->conf.Attributes = CONF_ENABLE_IRQ;

    link->conf.IntType = INT_MEMORY_AND_IO;

drivers/net/pcmcia/fmvj18x_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int fmvj18x_probe(struct pcmcia_device *link) 
    link->io.IOAddrLines = 5;



    /* Interrupt setup */

    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;

    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT;

    link->irq.IRQInfo1 = IRQ_LEVEL_ID;

    link->irq.Handler = &fjn_interrupt;

    link->irq.Instance = dev;

drivers/net/pcmcia/pcnet_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int pcnet_probe(struct pcmcia_device *link) 
    info->p_dev = link;

    link->priv = dev;



    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;

    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

    link->irq.IRQInfo1 = IRQ_LEVEL_ID;

    link->conf.Attributes = CONF_ENABLE_IRQ;

    link->conf.IntType = INT_MEMORY_AND_IO;