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

Commit 47cbb110 authored by Alan Cox's avatar Alan Cox Committed by John W. Linville
Browse files

pcmcia: Fix up legacy driver IRQs 



The PCMCIA layer obsoleted asking for per device private IRQS some years
ago and all the drivers by inspection correctly use dev_id and handle
shared interrupts [they get em anyway in most PCI bridged PCMCIA/Cardbus]
so can be adjusted.

This gets rid of the various bugs reported where there is spewage about
conflicting irq types and sometimes the driver won't load.

(Note I don't have all of these devices to test each one beyond by inspection)

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 638af073

drivers/net/wireless/airo_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int airo_probe(struct pcmcia_device *p_dev) 
	DEBUG(0, "airo_attach()\n");



	/* Interrupt setup */

	p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;

	p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

	p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;

	p_dev->irq.Handler = NULL;

drivers/net/wireless/atmel_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int atmel_probe(struct pcmcia_device *p_dev) 
	DEBUG(0, "atmel_attach()\n");



	/* Interrupt setup */

	p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;

	p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

	p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;

	p_dev->irq.Handler = NULL;

drivers/net/wireless/netwave_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static int netwave_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 = &netwave_interrupt;

drivers/net/wireless/orinoco_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ orinoco_cs_probe(struct pcmcia_device *link) 
	link->priv = dev;



	/* 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 = orinoco_interrupt;

	link->irq.Instance = dev;

drivers/net/wireless/ray_cs.c

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



    /* Interrupt setup. For PCMCIA, driver takes what's given */

    p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;

    p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;

    p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;

    p_dev->irq.Handler = &ray_interrupt;