Staging: comedi: pcmcia irq fixes
Replaced IRQ_TYPE_EXCLUSIVE with IRQ_TYPE_DYNAMIC_SHARING for pcmcia drivers. Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Родитель
ecb8486da3
Коммит
3d1c28848e
|
@ -744,7 +744,7 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link)
|
||||||
|
|
||||||
/* Initialize the pcmcia_device structure */
|
/* Initialize the pcmcia_device structure */
|
||||||
/* Interrupt setup */
|
/* Interrupt setup */
|
||||||
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
|
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||||
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
||||||
link->irq.Handler = NULL;
|
link->irq.Handler = NULL;
|
||||||
|
|
||||||
|
|
|
@ -520,7 +520,7 @@ static int dio700_cs_attach(struct pcmcia_device *link)
|
||||||
link->priv = local;
|
link->priv = local;
|
||||||
|
|
||||||
/* Interrupt setup */
|
/* Interrupt setup */
|
||||||
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
|
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||||
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
||||||
link->irq.Handler = NULL;
|
link->irq.Handler = NULL;
|
||||||
|
|
||||||
|
|
|
@ -271,7 +271,7 @@ static int dio24_cs_attach(struct pcmcia_device *link)
|
||||||
link->priv = local;
|
link->priv = local;
|
||||||
|
|
||||||
/* Interrupt setup */
|
/* Interrupt setup */
|
||||||
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
|
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||||
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
||||||
link->irq.Handler = NULL;
|
link->irq.Handler = NULL;
|
||||||
|
|
||||||
|
|
|
@ -246,7 +246,7 @@ static int labpc_cs_attach(struct pcmcia_device *link)
|
||||||
link->priv = local;
|
link->priv = local;
|
||||||
|
|
||||||
/* Interrupt setup */
|
/* Interrupt setup */
|
||||||
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE;
|
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE;
|
||||||
link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_PULSE_ID;
|
link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_PULSE_ID;
|
||||||
link->irq.Handler = NULL;
|
link->irq.Handler = NULL;
|
||||||
|
|
||||||
|
|
|
@ -273,7 +273,7 @@ static int cs_attach(struct pcmcia_device *link)
|
||||||
{
|
{
|
||||||
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
|
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
|
||||||
link->io.NumPorts1 = 16;
|
link->io.NumPorts1 = 16;
|
||||||
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
|
link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
|
||||||
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
|
||||||
link->conf.Attributes = CONF_ENABLE_IRQ;
|
link->conf.Attributes = CONF_ENABLE_IRQ;
|
||||||
link->conf.IntType = INT_MEMORY_AND_IO;
|
link->conf.IntType = INT_MEMORY_AND_IO;
|
||||||
|
|
|
@ -1079,7 +1079,7 @@ static int daqp_cs_attach(struct pcmcia_device *link)
|
||||||
link->priv = local;
|
link->priv = local;
|
||||||
|
|
||||||
/* Interrupt setup */
|
/* 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.IRQInfo1 = IRQ_LEVEL_ID;
|
||||||
link->irq.Handler = daqp_interrupt;
|
link->irq.Handler = daqp_interrupt;
|
||||||
link->irq.Instance = local;
|
link->irq.Instance = local;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче