diff options
author | Frank Mori Hess <fmhess@users.sourceforge.net> | 2009-09-22 16:32:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-09 16:47:25 -0400 |
commit | 3d1c28848ea37bf117940e10826f7a485aa32337 (patch) | |
tree | 25861421d31267771d277bf10e118c80ce27db94 /drivers | |
parent | ecb8486da36c5359eb910674c15c324f0157e43f (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/comedi/drivers/cb_das16_cs.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_dio24.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_cs.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index 12d12b43a6f1..80c0df8656f3 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c | |||
@@ -744,7 +744,7 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link) | |||
744 | 744 | ||
745 | /* Initialize the pcmcia_device structure */ | 745 | /* Initialize the pcmcia_device structure */ |
746 | /* Interrupt setup */ | 746 | /* Interrupt setup */ |
747 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 747 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
748 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 748 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; |
749 | link->irq.Handler = NULL; | 749 | link->irq.Handler = NULL; |
750 | 750 | ||
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index 6a7797604c97..ec31a3970664 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c | |||
@@ -520,7 +520,7 @@ static int dio700_cs_attach(struct pcmcia_device *link) | |||
520 | link->priv = local; | 520 | link->priv = local; |
521 | 521 | ||
522 | /* Interrupt setup */ | 522 | /* Interrupt setup */ |
523 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 523 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
524 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 524 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; |
525 | link->irq.Handler = NULL; | 525 | link->irq.Handler = NULL; |
526 | 526 | ||
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index b06e81c526e8..0700a8bddd1e 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c | |||
@@ -271,7 +271,7 @@ static int dio24_cs_attach(struct pcmcia_device *link) | |||
271 | link->priv = local; | 271 | link->priv = local; |
272 | 272 | ||
273 | /* Interrupt setup */ | 273 | /* Interrupt setup */ |
274 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 274 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
275 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 275 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; |
276 | link->irq.Handler = NULL; | 276 | link->irq.Handler = NULL; |
277 | 277 | ||
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index 57aecfa883c7..a3053b8da1c6 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c | |||
@@ -246,7 +246,7 @@ static int labpc_cs_attach(struct pcmcia_device *link) | |||
246 | link->priv = local; | 246 | link->priv = local; |
247 | 247 | ||
248 | /* Interrupt setup */ | 248 | /* Interrupt setup */ |
249 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE; | 249 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE; |
250 | link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_PULSE_ID; | 250 | link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_PULSE_ID; |
251 | link->irq.Handler = NULL; | 251 | link->irq.Handler = NULL; |
252 | 252 | ||
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c index b7322963cf78..9aef87fc81dc 100644 --- a/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c | |||
@@ -273,7 +273,7 @@ static int cs_attach(struct pcmcia_device *link) | |||
273 | { | 273 | { |
274 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | 274 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; |
275 | link->io.NumPorts1 = 16; | 275 | link->io.NumPorts1 = 16; |
276 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 276 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
277 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 277 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; |
278 | link->conf.Attributes = CONF_ENABLE_IRQ; | 278 | link->conf.Attributes = CONF_ENABLE_IRQ; |
279 | link->conf.IntType = INT_MEMORY_AND_IO; | 279 | link->conf.IntType = INT_MEMORY_AND_IO; |
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index f63bdc35cffd..344b82353e08 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c | |||
@@ -1079,7 +1079,7 @@ static int daqp_cs_attach(struct pcmcia_device *link) | |||
1079 | link->priv = local; | 1079 | link->priv = local; |
1080 | 1080 | ||
1081 | /* Interrupt setup */ | 1081 | /* Interrupt setup */ |
1082 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; | 1082 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; |
1083 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 1083 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; |
1084 | link->irq.Handler = daqp_interrupt; | 1084 | link->irq.Handler = daqp_interrupt; |
1085 | link->irq.Instance = local; | 1085 | link->irq.Instance = local; |