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

Commit aafcf998 authored by Alan Cox's avatar Alan Cox Committed by Dominik Brodowski
Browse files

pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted 



Switch more drivers to dynamic sharing after checking their IRQ handlers
use dev_id and are robust

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 26e9a397

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ static int bluecard_probe(struct pcmcia_device *link) 


	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	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 = bluecard_interrupt;

drivers/bluetooth/bt3c_cs.c

+4 −2
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) 
	bt3c_info_t *info = dev_inst;

	unsigned int iobase;

	int iir;

	irqreturn_t r = IRQ_NONE;



	BUG_ON(!info->hdev);
@@ -374,11 +375,12 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) 


			outb(iir, iobase + CONTROL);

		}

		r = IRQ_HANDLED;

	}



	spin_unlock(&(info->lock));



	return IRQ_HANDLED;

	return r;

}
@@ -657,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link) 


	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	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 = bt3c_interrupt;

drivers/bluetooth/btuart_cs.c

+4 −2
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst) 
	unsigned int iobase;

	int boguscount = 0;

	int iir, lsr;

	irqreturn_t r = IRQ_NONE;



	BUG_ON(!info->hdev);
@@ -302,6 +303,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst) 


	iir = inb(iobase + UART_IIR) & UART_IIR_ID;

	while (iir) {

		r = IRQ_HANDLED;



		/* Clear interrupt */

		lsr = inb(iobase + UART_LSR);
@@ -335,7 +337,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst) 


	spin_unlock(&(info->lock));



	return IRQ_HANDLED;

	return r;

}
@@ -586,7 +588,7 @@ static int btuart_probe(struct pcmcia_device *link) 


	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	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 = btuart_interrupt;

drivers/bluetooth/dtl1_cs.c

+5 −2
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst) 
	unsigned char msr;

	int boguscount = 0;

	int iir, lsr;

	irqreturn_t r = IRQ_NONE;



	BUG_ON(!info->hdev);
@@ -307,6 +308,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst) 
	iir = inb(iobase + UART_IIR) & UART_IIR_ID;

	while (iir) {



		r = IRQ_HANDLED;

		/* Clear interrupt */

		lsr = inb(iobase + UART_LSR);
@@ -343,11 +345,12 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst) 
		info->ri_latch = msr & UART_MSR_RI;

		clear_bit(XMIT_WAITING, &(info->tx_state));

		dtl1_write_wakeup(info);

		r = IRQ_HANDLED;

	}



	spin_unlock(&(info->lock));



	return IRQ_HANDLED;

	return r;

}
@@ -568,7 +571,7 @@ static int dtl1_probe(struct pcmcia_device *link) 


	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	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 = dtl1_interrupt;

drivers/char/pcmcia/synclink_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static int mgslpc_probe(struct pcmcia_device *link) 
    /* Initialize the struct pcmcia_device structure */



    /* Interrupt setup */

    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;

    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

    link->irq.IRQInfo1   = IRQ_LEVEL_ID;

    link->irq.Handler = NULL;