staging: comedi: remove pointer math for subdevice access
PATCH 1/1 staging: comedi: remove pointer math for subdevice access
Convert all the comedi_subdevice pointer access from pointer math to array access.
--- drivers/staging/comedi/comedi_fops.c | 28 ++++----- drivers/staging/comedi/drivers.c | 6 +- drivers/staging/comedi/drivers/8255.c | 4 +- drivers/staging/comedi/drivers/acl7225b.c | 6 +- .../staging/comedi/drivers/addi-data/addi_common.c | 14 ++--- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 21 +++---- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 6 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- drivers/staging/comedi/drivers/adl_pci6208.c | 6 +- drivers/staging/comedi/drivers/adl_pci7296.c | 4 +- drivers/staging/comedi/drivers/adl_pci7x3x.c | 8 +-- drivers/staging/comedi/drivers/adl_pci8164.c | 8 +-- drivers/staging/comedi/drivers/adl_pci9111.c | 8 +-- drivers/staging/comedi/drivers/adl_pci9118.c | 10 +-- drivers/staging/comedi/drivers/adq12b.c | 6 +- drivers/staging/comedi/drivers/adv_pci1710.c | 14 ++--- drivers/staging/comedi/drivers/adv_pci1723.c | 4 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 20 +++--- drivers/staging/comedi/drivers/aio_aio12_8.c | 10 +-- drivers/staging/comedi/drivers/aio_iiro_16.c | 4 +- drivers/staging/comedi/drivers/amplc_dio200.c | 6 +- drivers/staging/comedi/drivers/amplc_pc236.c | 8 +-- drivers/staging/comedi/drivers/amplc_pc263.c | 2 +- drivers/staging/comedi/drivers/amplc_pci224.c | 4 +- drivers/staging/comedi/drivers/amplc_pci230.c | 10 +-- drivers/staging/comedi/drivers/c6xdigio.c | 6 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 6 +- drivers/staging/comedi/drivers/cb_pcidas.c | 16 ++--- drivers/staging/comedi/drivers/cb_pcidas64.c | 22 +++---- drivers/staging/comedi/drivers/cb_pcidda.c | 10 +-- drivers/staging/comedi/drivers/cb_pcidio.c | 4 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/comedi/drivers/comedi_parport.c | 10 +-- drivers/staging/comedi/drivers/comedi_test.c | 4 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 4 +- drivers/staging/comedi/drivers/daqboard2000.c | 8 +-- drivers/staging/comedi/drivers/das08.c | 14 ++--- drivers/staging/comedi/drivers/das16.c | 12 ++-- drivers/staging/comedi/drivers/das16m1.c | 10 +-- drivers/staging/comedi/drivers/das1800.c | 10 +-- drivers/staging/comedi/drivers/das6402.c | 4 +- drivers/staging/comedi/drivers/das800.c | 8 +-- drivers/staging/comedi/drivers/dmm32at.c | 6 +- drivers/staging/comedi/drivers/dt2801.c | 6 +- drivers/staging/comedi/drivers/dt2811.c | 8 +-- drivers/staging/comedi/drivers/dt2814.c | 4 +- drivers/staging/comedi/drivers/dt2815.c | 2 +- drivers/staging/comedi/drivers/dt2817.c | 2 +- drivers/staging/comedi/drivers/dt282x.c | 11 ++-- drivers/staging/comedi/drivers/dt3000.c | 5 +- drivers/staging/comedi/drivers/dt9812.c | 8 +-- drivers/staging/comedi/drivers/dyna_pci10xx.c | 8 +-- drivers/staging/comedi/drivers/fl512.c | 4 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 2 +- drivers/staging/comedi/drivers/icp_multi.c | 10 +-- drivers/staging/comedi/drivers/ii_pci20kc.c | 4 +- drivers/staging/comedi/drivers/ke_counter.c | 2 +- drivers/staging/comedi/drivers/me4000.c | 10 +-- drivers/staging/comedi/drivers/me_daq.c | 6 +- drivers/staging/comedi/drivers/mpc624.c | 2 +- drivers/staging/comedi/drivers/mpc8260cpm.c | 2 +- drivers/staging/comedi/drivers/multiq3.c | 10 +-- drivers/staging/comedi/drivers/ni_6527.c | 8 +-- drivers/staging/comedi/drivers/ni_65xx.c | 10 +-- drivers/staging/comedi/drivers/ni_660x.c | 8 +-- drivers/staging/comedi/drivers/ni_670x.c | 6 +- drivers/staging/comedi/drivers/ni_at_a2150.c | 2 +- drivers/staging/comedi/drivers/ni_at_ao.c | 8 +-- drivers/staging/comedi/drivers/ni_atmio16d.c | 6 +- drivers/staging/comedi/drivers/ni_daq_700.c | 2 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 4 +- drivers/staging/comedi/drivers/ni_labpc.c | 12 ++-- drivers/staging/comedi/drivers/ni_mio_common.c | 61 +++++++++--------- drivers/staging/comedi/drivers/ni_pcidio.c | 8 +-- drivers/staging/comedi/drivers/pcl711.c | 4 +- drivers/staging/comedi/drivers/pcl724.c | 6 +- drivers/staging/comedi/drivers/pcl725.c | 4 +- drivers/staging/comedi/drivers/pcl726.c | 6 +- drivers/staging/comedi/drivers/pcl730.c | 8 +-- drivers/staging/comedi/drivers/pcl812.c | 12 ++-- drivers/staging/comedi/drivers/pcl816.c | 6 +- drivers/staging/comedi/drivers/pcl818.c | 18 +++--- drivers/staging/comedi/drivers/pcm3724.c | 16 ++--- drivers/staging/comedi/drivers/pcm3730.c | 12 ++-- drivers/staging/comedi/drivers/pcmad.c | 2 +- drivers/staging/comedi/drivers/pcmda12.c | 2 +- drivers/staging/comedi/drivers/pcmmio.c | 14 +++-- drivers/staging/comedi/drivers/pcmuio.c | 10 +-- drivers/staging/comedi/drivers/poc.c | 2 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 8 +-- drivers/staging/comedi/drivers/rtd520.c | 10 +-- drivers/staging/comedi/drivers/rti800.c | 2 +- drivers/staging/comedi/drivers/rti802.c | 2 +- drivers/staging/comedi/drivers/s526.c | 8 +-- drivers/staging/comedi/drivers/s626.c | 73 ++++++++++------------ drivers/staging/comedi/drivers/serial2002.c | 10 +-- drivers/staging/comedi/drivers/skel.c | 6 +- drivers/staging/comedi/drivers/ssv_dnp.c | 2 +- drivers/staging/comedi/drivers/usbdux.c | 16 ++--- drivers/staging/comedi/drivers/usbduxfast.c | 4 +- drivers/staging/comedi/drivers/usbduxsigma.c | 14 ++--- drivers/staging/comedi/drivers/vmk80xx.c | 12 ++-- .../staging/comedi/kcomedilib/kcomedilib_main.c | 4 +- drivers/staging/comedi/range.c | 2 +- 106 files changed, 459 insertions(+), 464 deletions(-)
drivers/staging/comedi/comedi_fops.c +14 -14
@@ -426,7 +426,7 @@ static int do_bufconfig_ioctl(struct comedi_device *dev,if (bc.subdevice >= dev->n_subdevices || bc.subdevice <0 )return -EINVAL ; - s = dev->subdevices + bc.subdevice; + s = &dev->subdevices[bc.subdevice]; async = s->async;if (!async) {
@@ -539,7 +539,7 @@ static int do_subdinfo_ioctl(struct comedi_device *dev,/* fill subdinfo structs */ for (i =0 ; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; us = tmp + i; us->type = s->type;
@@ -617,7 +617,7 @@ static int do_chaninfo_ioctl(struct comedi_device *dev,if (it.subdev >= dev->n_subdevices)return -EINVAL ; - s = dev->subdevices + it.subdev; + s = &dev->subdevices[it.subdev];if (it.maxdata_list) {if (s->maxdata || !s->maxdata_list)
@@ -685,7 +685,7 @@ static int do_bufinfo_ioctl(struct comedi_device *dev,if (bi.subdevice >= dev->n_subdevices || bi.subdevice <0 )return -EINVAL ; - s = dev->subdevices + bi.subdevice; + s = &dev->subdevices[bi.subdevice];if (s->lock && s->lock != file)return -EACCES ;
@@ -940,7 +940,7 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn, ret = -EINVAL ;break ; } - s = dev->subdevices + insn->subdev; + s = &dev->subdevices[insn->subdev];if (!s->async) {DPRINTK ("no async\n" ); ret = -EINVAL ;
@@ -969,7 +969,7 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn, ret = -EINVAL ; goto out; } - s = dev->subdevices + insn->subdev; + s = &dev->subdevices[insn->subdev];if (s->type ==COMEDI_SUBD_UNUSED ) {DPRINTK ("%d not usable subdevice\n" , insn->subdev);
@@ -1153,7 +1153,7 @@ static int do_cmd_ioctl(struct comedi_device *dev,return -ENODEV ; } - s = dev->subdevices + user_cmd.subdev; + s = &dev->subdevices[user_cmd.subdev]; async = s->async;if (s->type ==COMEDI_SUBD_UNUSED ) {
@@ -1303,7 +1303,7 @@ static int do_cmdtest_ioctl(struct comedi_device *dev,return -ENODEV ; } - s = dev->subdevices + user_cmd.subdev; + s = &dev->subdevices[user_cmd.subdev];if (s->type ==COMEDI_SUBD_UNUSED ) {DPRINTK ("%d not valid subdevice\n" , user_cmd.subdev);return -EIO ;
@@ -1390,7 +1390,7 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg,if (arg >= dev->n_subdevices)return -EINVAL ; - s = dev->subdevices + arg; + s = &dev->subdevices[arg];spin_lock_irqsave (&s->spin_lock, flags);if (s->busy || s->lock)
@@ -1433,7 +1433,7 @@ static int do_unlock_ioctl(struct comedi_device *dev, unsigned int arg,if (arg >= dev->n_subdevices)return -EINVAL ; - s = dev->subdevices + arg; + s = &dev->subdevices[arg];if (s->busy)return -EBUSY ;
@@ -1474,7 +1474,7 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg,if (arg >= dev->n_subdevices)return -EINVAL ; - s = dev->subdevices + arg; + s = &dev->subdevices[arg];if (s->async ==NULL )return -EINVAL ;
@@ -1511,7 +1511,7 @@ static int do_poll_ioctl(struct comedi_device *dev, unsigned int arg,if (arg >= dev->n_subdevices)return -EINVAL ; - s = dev->subdevices + arg; + s = &dev->subdevices[arg];if (s->lock && s->lock != file)return -EACCES ;
@@ -2140,7 +2140,7 @@ static int comedi_close(struct inode *inode, struct file *file)if (dev->subdevices) {for (i =0 ; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i];if (s->busy == file)do_cancel (dev, s);
@@ -2364,7 +2364,7 @@ static int is_device_busy(struct comedi_device *dev)return 0 ;for (i =0 ; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i];if (s->busy)return 1 ;if (s->async && s->async->mmap_count)
drivers/staging/comedi/drivers.c +3 -3
@@ -71,7 +71,7 @@ int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices) dev->n_subdevices = num_subdevices;for (i =0 ; i < num_subdevices; ++i) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; s->device = dev; s->async_dma_dir =DMA_NONE ;spin_lock_init (&s->spin_lock);
@@ -88,7 +88,7 @@ static void cleanup_device(struct comedi_device *dev)if (dev->subdevices) {for (i =0 ; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i];comedi_free_subdevice_minor (s);if (s->async) {comedi_buf_alloc (dev, s,0 );
@@ -263,7 +263,7 @@ static int postconfig(struct comedi_device *dev)int ret;for (i =0 ; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i];if (s->type ==COMEDI_SUBD_UNUSED )continue ;
drivers/staging/comedi/drivers/8255.c +2 -2
@@ -403,7 +403,7 @@ static int dev_8255_attach(struct comedi_device *dev,return ret;for (i =0 ; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; iobase = it->options[i];if (!request_region (iobase, _8255_SIZE,"8255" )) {
@@ -429,7 +429,7 @@ static void dev_8255_detach(struct comedi_device *dev)int i;for (i =0 ; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i];if (s->type !=COMEDI_SUBD_UNUSED ) { spriv = s->private;release_region (spriv->iobase, _8255_SIZE);
drivers/staging/comedi/drivers/acl7225b.c +3 -3
@@ -81,7 +81,7 @@ static int acl7225b_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* Relays outputs */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
@@ -91,7 +91,7 @@ static int acl7225b_attach(struct comedi_device *dev, s->range_table = &range_digital; s->private = (void *)ACL7225_RIO_LO ; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* Relays status */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -101,7 +101,7 @@ static int acl7225b_attach(struct comedi_device *dev, s->range_table = &range_digital; s->private = (void *)ACL7225_RIO_LO ; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* Isolated digital inputs */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
drivers/staging/comedi/drivers/addi-data/addi_common.c +7 -7
@@ -1669,7 +1669,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)return ret;/* Allocate and Initialise AI Subdevice Structures */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];if ((devpriv->s_EeParameters.i_NbrAiChannel) || (this_board->i_NbrAiChannelDiff)) { dev->read_subdev = s;
@@ -1705,7 +1705,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) }/* Allocate and Initialise AO Subdevice Structures */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];if (devpriv->s_EeParameters.i_NbrAoChannel) { s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITEABLE |SDF_GROUND |SDF_COMMON ;
@@ -1720,7 +1720,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) s->type =COMEDI_SUBD_UNUSED ; }/* Allocate and Initialise DI Subdevice Structures */ - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];if (devpriv->s_EeParameters.i_NbrDiChannel) { s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE |SDF_GROUND |SDF_COMMON ;
@@ -1738,7 +1738,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) s->type =COMEDI_SUBD_UNUSED ; }/* Allocate and Initialise DO Subdevice Structures */ - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];if (devpriv->s_EeParameters.i_NbrDoChannel) { s->type =COMEDI_SUBD_DO ; s->subdev_flags =
@@ -1760,7 +1760,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) }/* Allocate and Initialise Timer Subdevice Structures */ - s = dev->subdevices +4 ; + s = &dev->subdevices[4 ];if (devpriv->s_EeParameters.i_Timer) { s->type =COMEDI_SUBD_TIMER ; s->subdev_flags =SDF_WRITEABLE |SDF_GROUND |SDF_COMMON ;
@@ -1778,7 +1778,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) }/* Allocate and Initialise TTL */ - s = dev->subdevices +5 ; + s = &dev->subdevices[5 ];if (this_board->i_NbrTTLChannel) { s->type =COMEDI_SUBD_TTLIO ; s->subdev_flags =
@@ -1797,7 +1797,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) }/* EEPROM */ - s = dev->subdevices +6 ; + s = &dev->subdevices[6 ];if (this_board->i_PCIEeprom) { s->type =COMEDI_SUBD_MEMORY ; s->subdev_flags =SDF_READABLE |SDF_INTERNAL ;
drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c +9 -12
@@ -67,8 +67,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)return ;/* Allocate and Initialise Timer Subdevice Structures */ - s = dev->subdevices +0 ; - + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_TIMER ; s->subdev_flags =SDF_WRITEABLE |SDF_GROUND |SDF_COMMON ; s->n_chan =3 ;
@@ -81,8 +80,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev) s->insn_bits = i_APCI1710_InsnBitsTimer;/* Allocate and Initialise DIO Subdevice Structures */ - s = dev->subdevices +1 ; - + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_WRITEABLE |SDF_READABLE |SDF_GROUND |SDF_COMMON ;
@@ -96,8 +94,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev) s->insn_write = i_APCI1710_InsnWriteDigitalIOChlOnOff;/* Allocate and Initialise Chrono Subdevice Structures */ - s = dev->subdevices +2 ; - + s = &dev->subdevices[2 ]; s->type =COMEDI_SUBD_CHRONO ; s->subdev_flags =SDF_WRITEABLE |SDF_GROUND |SDF_COMMON ; s->n_chan =4 ;
@@ -110,7 +107,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev) s->insn_bits = i_APCI1710_InsnBitsChronoDigitalIO;/* Allocate and Initialise PWM Subdevice Structures */ - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_PWM ; s->subdev_flags =SDF_WRITEABLE |SDF_READABLE |SDF_GROUND |SDF_COMMON ;
@@ -125,7 +122,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev) s->insn_bits = i_APCI1710_InsnBitsReadPWMInterrupt;/* Allocate and Initialise TTLIO Subdevice Structures */ - s = dev->subdevices +4 ; + s = &dev->subdevices[4 ]; s->type =COMEDI_SUBD_TTLIO ; s->subdev_flags =SDF_WRITEABLE |SDF_READABLE |SDF_GROUND |SDF_COMMON ;
@@ -139,7 +136,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev) s->insn_read = i_APCI1710_InsnReadTTLIOAllPortValue;/* Allocate and Initialise TOR Subdevice Structures */ - s = dev->subdevices +5 ; + s = &dev->subdevices[5 ]; s->type =COMEDI_SUBD_TOR ; s->subdev_flags =SDF_WRITEABLE |SDF_READABLE |SDF_GROUND |SDF_COMMON ;
@@ -154,7 +151,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev) s->insn_bits = i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue;/* Allocate and Initialise SSI Subdevice Structures */ - s = dev->subdevices +6 ; + s = &dev->subdevices[6 ]; s->type =COMEDI_SUBD_SSI ; s->subdev_flags =SDF_WRITEABLE |SDF_READABLE |SDF_GROUND |SDF_COMMON ;
@@ -167,7 +164,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev) s->insn_bits = i_APCI1710_InsnBitsSSIDigitalIO;/* Allocate and Initialise PULSEENCODER Subdevice Structures */ - s = dev->subdevices +7 ; + s = &dev->subdevices[7 ]; s->type =COMEDI_SUBD_PULSEENCODER ; s->subdev_flags =SDF_WRITEABLE |SDF_READABLE |SDF_GROUND |SDF_COMMON ;
@@ -181,7 +178,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev) s->insn_read = i_APCI1710_InsnReadInterruptPulseEncoder;/* Allocate and Initialise INCREMENTALCOUNTER Subdevice Structures */ - s = dev->subdevices +8 ; + s = &dev->subdevices[8 ]; s->type =COMEDI_SUBD_INCREMENTALCOUNTER ; s->subdev_flags =SDF_WRITEABLE |SDF_READABLE |SDF_GROUND |SDF_COMMON ;
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +3 -3
@@ -1451,7 +1451,7 @@ void v_APCI3120_Interrupt(int irq, void *d)unsigned short us_TmpValue;unsigned char b_DummyRead; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ]; ui_Check =1 ; int_daq =inw (dev->iobase +APCI3120_RD_STATUS ) &0xf000 ;/* get IRQ reasons */
@@ -1656,7 +1656,7 @@ void v_APCI3120_Interrupt(int irq, void *d)int i_APCI3120_InterruptHandleEos (struct comedi_device *dev) {int n_chan, i; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];int err =1 ; n_chan = devpriv->ui_AiNbrofChannels;
@@ -1698,7 +1698,7 @@ int i_APCI3120_InterruptHandleEos(struct comedi_device *dev)void v_APCI3120_InterruptDma (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];unsigned int next_dma_buf, samplesinbuf;unsigned long low_word, high_word, var;
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +1 -1
@@ -3495,7 +3495,7 @@ void v_APCI3200_Interrupt(int irq, void *d)int i_APCI3200_InterruptHandleEos (struct comedi_device *dev) {unsigned int ui_StatusRegister =0 ; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];/* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */ /* comedi_async *async = s->async; */
drivers/staging/comedi/drivers/adl_pci6208.c +3 -3
@@ -205,7 +205,7 @@ static int pci6208_attach_pci(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog output subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -215,7 +215,7 @@ static int pci6208_attach_pci(struct comedi_device *dev, s->insn_write = pci6208_ao_winsn; s->insn_read = pci6208_ao_rinsn; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* digital input subdevice */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -224,7 +224,7 @@ static int pci6208_attach_pci(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = pci6208_di_insn_bits; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* digital output subdevice */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
drivers/staging/comedi/drivers/adl_pci7296.c +2 -2
@@ -121,7 +121,7 @@ static int adl_pci7296_attach_pci(struct comedi_device *dev,return ret;for (i =0 ; i < board->nsubdevs; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; ret =subdev_8255_init (dev, s,NULL , dev->iobase + (i *4 ));if (ret)return ret;
@@ -142,7 +142,7 @@ static void adl_pci7296_detach(struct comedi_device *dev)if (dev->subdevices) {for (i =0 ; i < board->nsubdevs; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i];subdev_8255_cleanup (dev, s); } }
drivers/staging/comedi/drivers/adl_pci7x3x.c +4 -4
@@ -211,7 +211,7 @@ static int adl_pci7x3x_attach_pci(struct comedi_device *dev,if (board->di_nchan) { nchan =min (board->di_nchan,32 ); - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev];/* Isolated digital inputs 0 to 15/31 */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -226,7 +226,7 @@ static int adl_pci7x3x_attach_pci(struct comedi_device *dev, nchan = board->di_nchan - nchan;if (nchan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev];/* Isolated digital inputs 32 to 63 */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -244,7 +244,7 @@ static int adl_pci7x3x_attach_pci(struct comedi_device *dev,if (board->do_nchan) { nchan =min (board->do_nchan,32 ); - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev];/* Isolated digital outputs 0 to 15/31 */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
@@ -259,7 +259,7 @@ static int adl_pci7x3x_attach_pci(struct comedi_device *dev, nchan = board->do_nchan - nchan;if (nchan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev];/* Isolated digital outputs 32 to 63 */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
drivers/staging/comedi/drivers/adl_pci8164.c +4 -4
@@ -231,7 +231,7 @@ static int adl_pci8164_attach_pci(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_PROC ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =4 ;
@@ -241,7 +241,7 @@ static int adl_pci8164_attach_pci(struct comedi_device *dev, s->insn_read = adl_pci8164_insn_read_msts; s->insn_write = adl_pci8164_insn_write_cmd; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_PROC ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =4 ;
@@ -251,7 +251,7 @@ static int adl_pci8164_attach_pci(struct comedi_device *dev, s->insn_read = adl_pci8164_insn_read_ssts; s->insn_write = adl_pci8164_insn_write_otp; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; s->type =COMEDI_SUBD_PROC ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =4 ;
@@ -261,7 +261,7 @@ static int adl_pci8164_attach_pci(struct comedi_device *dev, s->insn_read = adl_pci8164_insn_read_buf0; s->insn_write = adl_pci8164_insn_write_buf0; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_PROC ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =4 ;
drivers/staging/comedi/drivers/adl_pci9111.c +4 -4
@@ -1322,7 +1322,7 @@ static int pci9111_attach(struct comedi_device *dev,if (error)return error; - subdevice = dev->subdevices +0 ; + subdevice = &dev->subdevices[0 ]; dev->read_subdev = subdevice; subdevice->type =COMEDI_SUBD_AI ;
@@ -1342,7 +1342,7 @@ static int pci9111_attach(struct comedi_device *dev, subdevice->do_cmd = pci9111_ai_do_cmd; subdevice->munge = pci9111_ai_munge; - subdevice = dev->subdevices +1 ; + subdevice = &dev->subdevices[1 ]; subdevice->type =COMEDI_SUBD_AO ; subdevice->subdev_flags =SDF_WRITABLE |SDF_COMMON ; subdevice->n_chan = board->ao_channel_nbr;
@@ -1352,7 +1352,7 @@ static int pci9111_attach(struct comedi_device *dev, subdevice->insn_write = pci9111_ao_insn_write; subdevice->insn_read = pci9111_ao_insn_read; - subdevice = dev->subdevices +2 ; + subdevice = &dev->subdevices[2 ]; subdevice->type =COMEDI_SUBD_DI ; subdevice->subdev_flags =SDF_READABLE ; subdevice->n_chan =PCI9111_DI_CHANNEL_NBR ;
@@ -1360,7 +1360,7 @@ static int pci9111_attach(struct comedi_device *dev, subdevice->range_table = &range_digital; subdevice->insn_bits = pci9111_di_insn_bits; - subdevice = dev->subdevices +3 ; + subdevice = &dev->subdevices[3 ]; subdevice->type =COMEDI_SUBD_DO ; subdevice->subdev_flags =SDF_READABLE |SDF_WRITABLE ; subdevice->n_chan =PCI9111_DO_CHANNEL_NBR ;
drivers/staging/comedi/drivers/adl_pci9118.c +5 -5
@@ -837,7 +837,7 @@ static irqreturn_t interrupt_pci9118(int irq, void *d) } } - (devpriv->int_ai_func) (dev, dev->subdevices +0 , int_adstat, + (devpriv->int_ai_func) (dev, &dev->subdevices[0 ], int_adstat, int_amcc, int_daq); }
@@ -2273,7 +2273,7 @@ static int pci9118_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_COMMON |SDF_GROUND |SDF_DIFF ;
@@ -2294,7 +2294,7 @@ static int pci9118_attach(struct comedi_device *dev, s->munge = pci9118_ai_munge; } - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND |SDF_COMMON ; s->n_chan = this_board->n_aochan;
@@ -2304,7 +2304,7 @@ static int pci9118_attach(struct comedi_device *dev, s->insn_write = pci9118_insn_write_ao; s->insn_read = pci9118_insn_read_ao; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE |SDF_GROUND |SDF_COMMON ; s->n_chan =4 ;
@@ -2314,7 +2314,7 @@ static int pci9118_attach(struct comedi_device *dev, s->io_bits =0 ;/* all bits input */ s->insn_bits = pci9118_insn_bits_di; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND |SDF_COMMON ; s->n_chan =4 ;
drivers/staging/comedi/drivers/adq12b.c +3 -3
@@ -272,7 +272,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog input subdevice */ s->type =COMEDI_SUBD_AI ;if (differential) {
@@ -294,7 +294,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)the board can handle */ s->insn_read = adq12b_ai_rinsn; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* digital input subdevice */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -303,7 +303,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table = &range_digital; s->insn_bits = adq12b_di_insn_bits; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* digital output subdevice */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
drivers/staging/comedi/drivers/adv_pci1710.c +7 -7
@@ -744,7 +744,7 @@ static void interrupt_pci1710_every_sample(void *d) {struct comedi_device *dev = d;struct pci1710_private *devpriv = dev->private; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];int m;#ifdef PCI171x_PARANOIDCHECKconst struct boardtype *this_board =comedi_board (dev);
@@ -873,7 +873,7 @@ static void interrupt_pci1710_half_fifo(void *d)struct comedi_device *dev = d;const struct boardtype *this_board =comedi_board (dev);struct pci1710_private *devpriv = dev->private; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];int m, samplesinbuf; m =inw (dev->iobase + PCI171x_STATUS);
@@ -1395,7 +1395,7 @@ static int pci1710_attach(struct comedi_device *dev, subdev =0 ;if (this_board->n_aichan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_COMMON |SDF_GROUND ;
@@ -1417,7 +1417,7 @@ static int pci1710_attach(struct comedi_device *dev, }if (this_board->n_aochan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND |SDF_COMMON ; s->n_chan = this_board->n_aochan;
@@ -1437,7 +1437,7 @@ static int pci1710_attach(struct comedi_device *dev, }if (this_board->n_dichan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE |SDF_GROUND |SDF_COMMON ; s->n_chan = this_board->n_dichan;
@@ -1450,7 +1450,7 @@ static int pci1710_attach(struct comedi_device *dev, }if (this_board->n_dochan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND |SDF_COMMON ; s->n_chan = this_board->n_dochan;
@@ -1465,7 +1465,7 @@ static int pci1710_attach(struct comedi_device *dev, }if (this_board->n_counter) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_COUNTER ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan = this_board->n_counter;
drivers/staging/comedi/drivers/adv_pci1723.c +2 -2
@@ -258,7 +258,7 @@ static int pci1723_attach_pci(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->write_subdev = s; s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITEABLE |SDF_GROUND |SDF_COMMON ;
@@ -269,7 +269,7 @@ static int pci1723_attach_pci(struct comedi_device *dev, s->insn_write = pci1723_ao_write_winsn; s->insn_read = pci1723_insn_read_ao; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =16 ;
drivers/staging/comedi/drivers/adv_pci_dio.c +10 -10
@@ -957,7 +957,7 @@ static int pci1760_attach(struct comedi_device *dev)struct comedi_subdevice *s;int subdev =0 ; - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE |SDF_GROUND |SDF_COMMON ; s->n_chan =8 ;
@@ -967,7 +967,7 @@ static int pci1760_attach(struct comedi_device *dev) s->insn_bits = pci1760_insn_bits_di; subdev++; - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND |SDF_COMMON ; s->n_chan =8 ;
@@ -978,7 +978,7 @@ static int pci1760_attach(struct comedi_device *dev) s->insn_bits = pci1760_insn_bits_do; subdev++; - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_TIMER ; s->subdev_flags =SDF_WRITABLE |SDF_LSAMPL ; s->n_chan =2 ;
@@ -987,7 +987,7 @@ static int pci1760_attach(struct comedi_device *dev)/* s->insn_config=pci1760_insn_pwm_cfg; */ subdev++; - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_COUNTER ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =8 ;
@@ -1128,21 +1128,21 @@ static int pci_dio_attach_pci(struct comedi_device *dev, subdev =0 ;for (i =0 ; i <MAX_DI_SUBDEVS ; i++)if (this_board->sdi[i].chans) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev];pci_dio_add_di (dev, s, &this_board->sdi[i], subdev); subdev++; }for (i =0 ; i <MAX_DO_SUBDEVS ; i++)if (this_board->sdo[i].chans) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev];pci_dio_add_do (dev, s, &this_board->sdo[i], subdev); subdev++; }for (i =0 ; i <MAX_DIO_SUBDEVG ; i++)for (j =0 ; j < this_board->sdio[i].regs; j++) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; subdev_8255_init(dev, s, NULL, dev->iobase + this_board->sdio[i].addr +
@@ -1151,7 +1151,7 @@ static int pci_dio_attach_pci(struct comedi_device *dev, }if (this_board->boardid.chans) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_DI ;pci_dio_add_di (dev, s, &this_board->boardid, subdev); subdev++;
@@ -1159,7 +1159,7 @@ static int pci_dio_attach_pci(struct comedi_device *dev,for (i =0 ; i <MAX_8254_SUBDEVS ; i++)if (this_board->s8254[i].chans) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev];pci_dio_add_8254 (dev, s, &this_board->s8254[i], subdev); subdev++; }
@@ -1187,7 +1187,7 @@ static void pci_dio_detach(struct comedi_device *dev) }if (dev->subdevices) {for (i =0 ; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i];if (s->type ==COMEDI_SUBD_DIO )subdev_8255_cleanup (dev, s); s->private =NULL ;
drivers/staging/comedi/drivers/aio_aio12_8.c +5 -5
@@ -221,7 +221,7 @@ static int aio_aio12_8_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];if (board->ai_nchan) {/* Analog input subdevice */ s->type =COMEDI_SUBD_AI ;
@@ -234,7 +234,7 @@ static int aio_aio12_8_attach(struct comedi_device *dev, s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];if (board->ao_nchan) {/* Analog output subdevice */ s->type =COMEDI_SUBD_AO ;
@@ -248,14 +248,14 @@ static int aio_aio12_8_attach(struct comedi_device *dev, s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* 8255 Digital i/o subdevice */ iobase = dev->iobase +AIO12_8_8255_BASE_REG ; ret =subdev_8255_init (dev, s,NULL , iobase);if (ret)return ret; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];/* 8254 counter/timer subdevice */ s->type =COMEDI_SUBD_UNUSED ;
@@ -268,7 +268,7 @@ static int aio_aio12_8_attach(struct comedi_device *dev,static void aio_aio12_8_detach (struct comedi_device *dev) {if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +2 ); +subdev_8255_cleanup (dev, &dev->subdevices[2 ]);if (dev->iobase)release_region (dev->iobase,24 ); }
drivers/staging/comedi/drivers/aio_iiro_16.c +2 -2
@@ -112,7 +112,7 @@ static int aio_iiro_16_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_WRITABLE ; s->n_chan =16 ;
@@ -120,7 +120,7 @@ static int aio_iiro_16_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = aio_iiro_16_dio_insn_bits_write; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE ; s->n_chan =16 ;
drivers/staging/comedi/drivers/amplc_dio200.c +3 -3
@@ -978,15 +978,15 @@ static irqreturn_t dio200_interrupt(int irq, void *d) {struct comedi_device *dev = d;struct dio200_private *devpriv = dev->private; +struct comedi_subdevice *s;int handled;if (!dev->attached)return IRQ_NONE ;if (devpriv->intr_sd >=0 ) { - handled =dio200_handle_read_intr (dev, - dev->subdevices + - devpriv->intr_sd); + s = &dev->subdevices[devpriv->intr_sd]; + handled =dio200_handle_read_intr (dev, s); }else { handled =0 ; }
drivers/staging/comedi/drivers/amplc_pc236.c +4 -4
@@ -395,7 +395,7 @@ static int pc236_intr_cancel(struct comedi_device *dev,static irqreturn_t pc236_interrupt (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +1 ; +struct comedi_subdevice *s = &dev->subdevices[1 ];int handled; handled =pc236_intr_check (dev);
@@ -449,14 +449,14 @@ static int pc236_common_attach(struct comedi_device *dev, unsigned long iobase,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* digital i/o subdevice (8255) */ ret =subdev_8255_init (dev, s,NULL , iobase);if (ret <0 ) {dev_err (dev->class_dev,"error! out of memory!\n" );return ret; } - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_UNUSED ;pc236_intr_disable (dev);
@@ -578,7 +578,7 @@ static void pc236_detach(struct comedi_device *dev)if (dev->irq)free_irq (dev->irq, dev);if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +0 ); +subdev_8255_cleanup (dev, &dev->subdevices[0 ]);if (pcidev) {if (dev->iobase)comedi_pci_disable (pcidev);
drivers/staging/comedi/drivers/amplc_pc263.c +1 -1
@@ -212,7 +212,7 @@ static int pc263_common_attach(struct comedi_device *dev, unsigned long iobase)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* digital output subdevice */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ;
drivers/staging/comedi/drivers/amplc_pci224.c +2 -2
@@ -1375,7 +1375,7 @@ static int pci224_attach_common(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* Analog output subdevice. */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND |SDF_CMD_WRITE ;
@@ -1516,7 +1516,7 @@ static void pci224_detach(struct comedi_device *dev)if (dev->subdevices) {struct comedi_subdevice *s; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* AO subdevice */ kfree (s->range_table_list); }
drivers/staging/comedi/drivers/amplc_pci230.c +6 -4
@@ -2838,7 +2838,7 @@ static int pci230_attach_common(struct comedi_device *dev,if (rc)return rc; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog input subdevice */ s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_DIFF |SDF_GROUND ;
@@ -2855,7 +2855,8 @@ static int pci230_attach_common(struct comedi_device *dev, s->do_cmdtest = &pci230_ai_cmdtest; s->cancel = pci230_ai_cancel; } - s = dev->subdevices +1 ; + + s = &dev->subdevices[1 ];/* analog output subdevice */ if (thisboard->ao_chans >0 ) { s->type =COMEDI_SUBD_AO ;
@@ -2878,7 +2879,8 @@ static int pci230_attach_common(struct comedi_device *dev, }else { s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +2 ; + + s = &dev->subdevices[2 ];/* digital i/o subdevice */ if (thisboard->have_dio) { rc = subdev_8255_init(dev, s, NULL,
@@ -2934,7 +2936,7 @@ static void pci230_detach(struct comedi_device *dev)struct pci_dev *pcidev =comedi_to_pci_dev (dev);if (dev->subdevices && thisboard->have_dio) -subdev_8255_cleanup (dev, dev->subdevices +2 ); +subdev_8255_cleanup (dev, &dev->subdevices[2 ]);if (dev->irq)free_irq (dev->irq, dev);if (pcidev) {
drivers/staging/comedi/drivers/c6xdigio.c +3 -3
@@ -447,7 +447,7 @@ static int c6xdigio_attach(struct comedi_device *dev,else if (irq ==0 )printk (KERN_DEBUG "comedi%d: no irq\n" , dev->minor); - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* pwm output subdevice */ s->type =COMEDI_SUBD_AO ;/* Not sure what to put here */ s->subdev_flags =SDF_WRITEABLE ;
@@ -458,7 +458,7 @@ static int c6xdigio_attach(struct comedi_device *dev, s->maxdata =500 ; s->range_table = &range_bipolar10;/* A suitable lie */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* encoder (counter) subdevice */ s->type =COMEDI_SUBD_COUNTER ; s->subdev_flags =SDF_READABLE |SDF_LSAMPL ;
@@ -468,7 +468,7 @@ static int c6xdigio_attach(struct comedi_device *dev, s->maxdata =0xffffff ; s->range_table = &range_unknown; -/* s = dev->subdevices + 2; */ +/* s = &dev->subdevices[2]; */ /* pwm output subdevice */ /* s->type = COMEDI_SUBD_COUNTER; // Not sure what to put here */ /* s->subdev_flags = SDF_WRITEABLE; */
drivers/staging/comedi/drivers/cb_das16_cs.c +3 -3
@@ -478,7 +478,7 @@ static int das16cs_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s;/* analog input subdevice */ s->type =COMEDI_SUBD_AI ;
@@ -491,7 +491,7 @@ static int das16cs_attach(struct comedi_device *dev, s->do_cmd = das16cs_ai_cmd; s->do_cmdtest = das16cs_ai_cmdtest; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* analog output subdevice */ if (thisboard->n_ao_chans) { s->type =COMEDI_SUBD_AO ;
@@ -505,7 +505,7 @@ static int das16cs_attach(struct comedi_device *dev, s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* digital i/o subdevice */ s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ;
drivers/staging/comedi/drivers/cb_pcidas.c +8 -8
@@ -1560,7 +1560,7 @@ static int cb_pcidas_attach_pci(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog input subdevice */ dev->read_subdev = s; s->type =COMEDI_SUBD_AI ;
@@ -1577,7 +1577,7 @@ static int cb_pcidas_attach_pci(struct comedi_device *dev, s->cancel = cb_pcidas_cancel;/* analog output subdevice */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];if (thisboard->ao_nchan) { s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_GROUND ;
@@ -1604,14 +1604,14 @@ static int cb_pcidas_attach_pci(struct comedi_device *dev, }/* 8255 */ - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; ret =subdev_8255_init (dev, s,NULL , devpriv->pacer_counter_dio +DIO_8255 );if (ret)return ret;/* serial EEPROM, */ - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_MEMORY ; s->subdev_flags =SDF_READABLE |SDF_INTERNAL ; s->n_chan =256 ;
@@ -1619,7 +1619,7 @@ static int cb_pcidas_attach_pci(struct comedi_device *dev, s->insn_read = eeprom_read_insn;/* 8800 caldac */ - s = dev->subdevices +4 ; + s = &dev->subdevices[4 ]; s->type =COMEDI_SUBD_CALIB ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_INTERNAL ; s->n_chan =NUM_CHANNELS_8800 ;
@@ -1630,7 +1630,7 @@ static int cb_pcidas_attach_pci(struct comedi_device *dev,caldac_8800_write (dev, i, s->maxdata /2 );/* trim potentiometer */ - s = dev->subdevices +5 ; + s = &dev->subdevices[5 ]; s->type =COMEDI_SUBD_CALIB ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_INTERNAL ;if (thisboard->trimpot ==AD7376 ) {
@@ -1646,7 +1646,7 @@ static int cb_pcidas_attach_pci(struct comedi_device *dev,cb_pcidas_trimpot_write (dev, i, s->maxdata /2 );/* dac08 caldac */ - s = dev->subdevices +6 ; + s = &dev->subdevices[6 ];if (thisboard->has_dac08) { s->type =COMEDI_SUBD_CALIB ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_INTERNAL ;
@@ -1688,7 +1688,7 @@ static void cb_pcidas_detach(struct comedi_device *dev)if (dev->irq)free_irq (dev->irq, dev);if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +2 ); +subdev_8255_cleanup (dev, &dev->subdevices[2 ]);if (pcidev) {if (devpriv->s5933_config)comedi_pci_disable (pcidev);
drivers/staging/comedi/drivers/cb_pcidas64.c +11 -11
@@ -1348,7 +1348,7 @@ static int setup_subdevices(struct comedi_device *dev)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog input subdevice */ dev->read_subdev = s; s->type =COMEDI_SUBD_AI ;
@@ -1379,7 +1379,7 @@ static int setup_subdevices(struct comedi_device *dev) }/* analog output subdevice */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];if (board (dev)->ao_nchan) { s->type =COMEDI_SUBD_AO ; s->subdev_flags =
@@ -1401,7 +1401,7 @@ static int setup_subdevices(struct comedi_device *dev) }/* digital input */ - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];if (board (dev)->layout ==LAYOUT_64XX ) { s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -1414,7 +1414,7 @@ static int setup_subdevices(struct comedi_device *dev)/* digital output */ if (board (dev)->layout ==LAYOUT_64XX ) { - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE |SDF_READABLE ; s->n_chan =4 ;
@@ -1425,7 +1425,7 @@ static int setup_subdevices(struct comedi_device *dev) s->type =COMEDI_SUBD_UNUSED ;/* 8255 */ - s = dev->subdevices +4 ; + s = &dev->subdevices[4 ];if (board (dev)->has_8255) {if (board (dev)->layout ==LAYOUT_4020 ) { dio_8255_iobase =
@@ -1442,7 +1442,7 @@ static int setup_subdevices(struct comedi_device *dev) s->type =COMEDI_SUBD_UNUSED ;/* 8 channel dio for 60xx */ - s = dev->subdevices +5 ; + s = &dev->subdevices[5 ];if (board (dev)->layout ==LAYOUT_60XX ) { s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_WRITABLE |SDF_READABLE ;
@@ -1455,7 +1455,7 @@ static int setup_subdevices(struct comedi_device *dev) s->type =COMEDI_SUBD_UNUSED ;/* caldac */ - s = dev->subdevices +6 ; + s = &dev->subdevices[6 ]; s->type =COMEDI_SUBD_CALIB ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_INTERNAL ; s->n_chan =8 ;
@@ -1469,7 +1469,7 @@ static int setup_subdevices(struct comedi_device *dev)caldac_write (dev, i, s->maxdata /2 );/* 2 channel ad8402 potentiometer */ - s = dev->subdevices +7 ; + s = &dev->subdevices[7 ];if (board (dev)->layout ==LAYOUT_64XX ) { s->type =COMEDI_SUBD_CALIB ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_INTERNAL ;
@@ -1483,7 +1483,7 @@ static int setup_subdevices(struct comedi_device *dev) s->type =COMEDI_SUBD_UNUSED ;/* serial EEPROM, if present */ - s = dev->subdevices +8 ; + s = &dev->subdevices[8 ];if (readl (priv (dev)->plx9080_iobase +PLX_CONTROL_REG ) &CTL_EECHK ) { s->type =COMEDI_SUBD_MEMORY ; s->subdev_flags =SDF_READABLE |SDF_INTERNAL ;
@@ -1494,7 +1494,7 @@ static int setup_subdevices(struct comedi_device *dev) s->type =COMEDI_SUBD_UNUSED ;/* user counter subd XXX */ - s = dev->subdevices +9 ; + s = &dev->subdevices[9 ]; s->type =COMEDI_SUBD_UNUSED ;return 0 ;
@@ -1847,7 +1847,7 @@ static void detach(struct comedi_device *dev) } }if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +4 ); +subdev_8255_cleanup (dev, &dev->subdevices[4 ]);if (pcidev) {if (dev->iobase)comedi_pci_disable (pcidev);
drivers/staging/comedi/drivers/cb_pcidda.c +5 -5
@@ -716,7 +716,7 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog output subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -730,9 +730,9 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,/* s->do_cmdtest = cb_pcidda_ai_cmdtest; */ /* two 8255 digital io subdevices */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];subdev_8255_init (dev, s,NULL , devpriv->digitalio); - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];subdev_8255_init (dev, s,NULL , devpriv->digitalio +PORT2A );dev_dbg (dev->class_dev,"eeprom:\n" );
@@ -756,8 +756,8 @@ static void cb_pcidda_detach(struct comedi_device *dev)struct pci_dev *pcidev =comedi_to_pci_dev (dev);if (dev->subdevices) { -subdev_8255_cleanup (dev, dev->subdevices +1 ); -subdev_8255_cleanup (dev, dev->subdevices +2 ); +subdev_8255_cleanup (dev, &dev->subdevices[1 ]); +subdev_8255_cleanup (dev, &dev->subdevices[2 ]); }if (pcidev) {if (dev->iobase)
drivers/staging/comedi/drivers/cb_pcidio.c +2 -2
@@ -119,7 +119,7 @@ static int pcidio_attach_pci(struct comedi_device *dev,return ret;for (i =0 ; i < board->n_8255; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; ret =subdev_8255_init (dev, s,NULL , dev->iobase + i *4 );if (ret)return ret;
@@ -140,7 +140,7 @@ static void pcidio_detach(struct comedi_device *dev)if (dev->subdevices) {for (i =0 ; i < board->n_8255; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i];subdev_8255_cleanup (dev, s); } }
drivers/staging/comedi/drivers/cb_pcimdas.c +3 -3
@@ -318,7 +318,7 @@ static int cb_pcimdas_attach_pci(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* dev->read_subdev=s; */ /* analog input subdevice */ s->type =COMEDI_SUBD_AI ;
@@ -330,7 +330,7 @@ static int cb_pcimdas_attach_pci(struct comedi_device *dev,/* the board can handle */ s->insn_read = cb_pcimdas_ai_rinsn; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* analog output subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -341,7 +341,7 @@ static int cb_pcimdas_attach_pci(struct comedi_device *dev, s->insn_write = &cb_pcimdas_ao_winsn; s->insn_read = &cb_pcimdas_ao_rinsn; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* digital i/o subdevice */ if (thisboard->has_dio)subdev_8255_init (dev, s,NULL , iobase_8255);
drivers/staging/comedi/drivers/cb_pcimdda.c +3 -3
@@ -176,7 +176,7 @@ static int cb_pcimdda_attach_pci(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog output subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE |SDF_READABLE ;
@@ -186,7 +186,7 @@ static int cb_pcimdda_attach_pci(struct comedi_device *dev, s->insn_write = cb_pcimdda_ao_winsn; s->insn_read = cb_pcimdda_ao_rinsn; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* digital i/o subdevice */ ret =subdev_8255_init (dev, s,NULL , dev->iobase +PCIMDDA_8255_BASE_REG );
@@ -203,7 +203,7 @@ static void cb_pcimdda_detach(struct comedi_device *dev)struct pci_dev *pcidev =comedi_to_pci_dev (dev);if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +1 ); +subdev_8255_cleanup (dev, &dev->subdevices[1 ]);if (pcidev) {if (dev->iobase)comedi_pci_disable (pcidev);
drivers/staging/comedi/drivers/comedi_bond.c +1 -1
@@ -321,7 +321,7 @@ static int bonding_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan = devpriv->nchans;
drivers/staging/comedi/drivers/comedi_parport.c +5 -5
@@ -277,7 +277,7 @@ static irqreturn_t parport_interrupt(int irq, void *d) {struct comedi_device *dev = d;struct parport_private *devpriv = dev->private; -struct comedi_subdevice *s = dev->subdevices +3 ; +struct comedi_subdevice *s = &dev->subdevices[3 ];if (!devpriv->enable_irq)return IRQ_NONE ;
@@ -327,7 +327,7 @@ static int parport_attach(struct comedi_device *dev,return ret; devpriv = dev->private; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =8 ;
@@ -336,7 +336,7 @@ static int parport_attach(struct comedi_device *dev, s->insn_bits = parport_insn_a; s->insn_config = parport_insn_config_a; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->n_chan =5 ;
@@ -344,7 +344,7 @@ static int parport_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = parport_insn_b; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ; s->n_chan =4 ;
@@ -352,7 +352,7 @@ static int parport_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = parport_insn_c; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];if (irq) { dev->read_subdev = s; s->type =COMEDI_SUBD_DI ;
drivers/staging/comedi/drivers/comedi_test.c +2 -2
@@ -453,7 +453,7 @@ static int waveform_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s;/* analog input subdevice */ s->type =COMEDI_SUBD_AI ;
@@ -467,7 +467,7 @@ static int waveform_attach(struct comedi_device *dev, s->do_cmdtest = waveform_ai_cmdtest; s->cancel = waveform_ai_cancel; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; dev->write_subdev = s;/* analog output subdevice (loopback) */ s->type =COMEDI_SUBD_AO ;
drivers/staging/comedi/drivers/contec_pci_dio.c +2 -2
@@ -140,7 +140,7 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) dev->iobase =pci_resource_start (pcidev,0 );printk (" base addr %lx " , dev->iobase); - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -149,7 +149,7 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table = &range_digital; s->insn_bits = contec_di_insn_bits; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ; s->n_chan =16 ;
drivers/staging/comedi/drivers/daqboard2000.c +4 -4
@@ -804,7 +804,7 @@ static int daqboard2000_attach(struct comedi_device *dev, dev->board_name = this_board->name; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* ai subdevice */ s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND ;
@@ -813,7 +813,7 @@ static int daqboard2000_attach(struct comedi_device *dev, s->insn_read = daqboard2000_ai_insn_read; s->range_table = &range_daqboard2000_ai; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* ao subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -823,7 +823,7 @@ static int daqboard2000_attach(struct comedi_device *dev, s->insn_write = daqboard2000_ao_insn_write; s->range_table = &range_daqboard2000_ao; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; result =subdev_8255_init (dev, s, daqboard2000_8255_cb, (unsigned long )(devpriv->daq +0x40 ));
@@ -836,7 +836,7 @@ static void daqboard2000_detach(struct comedi_device *dev)struct pci_dev *pcidev =comedi_to_pci_dev (dev);if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +2 ); +subdev_8255_cleanup (dev, &dev->subdevices[2 ]);if (dev->irq)free_irq (dev->irq, dev);if (devpriv) {
drivers/staging/comedi/drivers/das08.c +7 -7
@@ -765,7 +765,7 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* ai */ if (thisboard->ai) { s->type =COMEDI_SUBD_AI ;
@@ -784,7 +784,7 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase) s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* ao */ if (thisboard->ao) { s->type =COMEDI_SUBD_AO ;
@@ -798,7 +798,7 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase) s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* di */ if (thisboard->di) { s->type =COMEDI_SUBD_DI ;
@@ -811,7 +811,7 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase) s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];/* do */ if (thisboard->do_) { s->type =COMEDI_SUBD_DO ;
@@ -824,7 +824,7 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase) s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +4 ; + s = &dev->subdevices[4 ];/* 8255 */ if (thisboard->i8255_offset !=0 ) { subdev_8255_init(dev, s, NULL, (unsigned long)(dev->iobase +
@@ -834,7 +834,7 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase) s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +5 ; + s = &dev->subdevices[5 ];/* 8254 */ if (thisboard->i8254_offset !=0 ) { s->type =COMEDI_SUBD_COUNTER ;
@@ -1012,7 +1012,7 @@ das08_attach(struct comedi_device *dev, struct comedi_devconfig *it)void das08_common_detach (struct comedi_device *dev) {if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +4 ); +subdev_8255_cleanup (dev, &dev->subdevices[4 ]); }EXPORT_SYMBOL_GPL (das08_common_detach);
drivers/staging/comedi/drivers/das16.c +6 -6
@@ -1268,7 +1268,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s;/* ai */ if (board->ai) {
@@ -1300,7 +1300,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* ao */ if (board->ao) { s->type =COMEDI_SUBD_AO ;
@@ -1318,7 +1318,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* di */ if (board->di) { s->type =COMEDI_SUBD_DI ;
@@ -1331,7 +1331,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];/* do */ if (board->do_) { s->type =COMEDI_SUBD_DO ;
@@ -1346,7 +1346,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +4 ; + s = &dev->subdevices[4 ];/* 8255 */ if (board->i8255_offset !=0 ) { subdev_8255_init(dev, s, NULL, (dev->iobase +
@@ -1376,7 +1376,7 @@ static void das16_detach(struct comedi_device *dev)das16_reset (dev);if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +4 ); +subdev_8255_cleanup (dev, &dev->subdevices[4 ]);if (devpriv) {int i;for (i =0 ; i <2 ; i++) {
drivers/staging/comedi/drivers/das16m1.c +5 -5
@@ -650,7 +650,7 @@ static int das16m1_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s;/* ai */ s->type =COMEDI_SUBD_AI ;
@@ -666,7 +666,7 @@ static int das16m1_attach(struct comedi_device *dev, s->cancel = das16m1_cancel; s->poll = das16m1_poll; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* di */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -675,7 +675,7 @@ static int das16m1_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = das16m1_di_rbits; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* do */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE |SDF_READABLE ;
@@ -684,7 +684,7 @@ static int das16m1_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = das16m1_do_wbits; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];/* 8255 */ subdev_8255_init (dev, s,NULL , dev->iobase +DAS16M1_82C55 );
@@ -707,7 +707,7 @@ static int das16m1_attach(struct comedi_device *dev,static void das16m1_detach (struct comedi_device *dev) {if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +3 ); +subdev_8255_cleanup (dev, &dev->subdevices[3 ]);if (dev->irq)free_irq (dev->irq, dev);if (dev->iobase) {
drivers/staging/comedi/drivers/das1800.c +5 -5
@@ -656,7 +656,7 @@ static int das1800_cancel(struct comedi_device *dev, struct comedi_subdevice *s)/* the guts of the interrupt handler, that is shared with das1800_ai_poll */ static void das1800_ai_handler (struct comedi_device *dev) { -struct comedi_subdevice *s = dev->subdevices +0 ;/* analog input subdevice */ +struct comedi_subdevice *s = &dev->subdevices[0 ];/* ai subdevice */ struct comedi_async *async = s->async;struct comedi_cmd *cmd = &async->cmd;unsigned int status =inb (dev->iobase +DAS1800_STATUS );
@@ -1653,7 +1653,7 @@ static int das1800_attach(struct comedi_device *dev,return retval;/* analog input subdevice */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_DIFF |SDF_GROUND |SDF_CMD_READ ;
@@ -1670,7 +1670,7 @@ static int das1800_attach(struct comedi_device *dev, s->cancel = das1800_cancel;/* analog out */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];if (thisboard->ao_ability ==1 ) { s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -1683,7 +1683,7 @@ static int das1800_attach(struct comedi_device *dev, }/* di */ - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->n_chan =4 ;
@@ -1692,7 +1692,7 @@ static int das1800_attach(struct comedi_device *dev, s->insn_bits = das1800_di_rbits;/* do */ - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE |SDF_READABLE ; s->n_chan = thisboard->do_n_chan;
drivers/staging/comedi/drivers/das6402.c +2 -2
@@ -152,7 +152,7 @@ static void das6402_setcounter(struct comedi_device *dev)static irqreturn_t intr_handler (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices; +struct comedi_subdevice *s = &dev->subdevices[0 ];if (!dev->attached || devpriv->das6402_ignoreirq) {dev_warn (dev->class_dev,"BUG: spurious interrupt\n" );
@@ -312,7 +312,7 @@ static int das6402_attach(struct comedi_device *dev,return ret;/* ai subdevice */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND ; s->n_chan =8 ;
drivers/staging/comedi/drivers/das800.c +4 -4
@@ -435,7 +435,7 @@ static irqreturn_t das800_interrupt(int irq, void *d)if (fifo_overflow) {spin_unlock_irqrestore (&dev->spinlock, irq_flags);comedi_error (dev,"DAS800 FIFO overflow" ); -das800_cancel (dev, dev->subdevices +0 ); +das800_cancel (dev, &dev->subdevices[0 ]); async->events |=COMEDI_CB_ERROR |COMEDI_CB_EOA ;comedi_event (dev, s); async->events =0 ;
@@ -517,7 +517,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)return ret;/* analog input subdevice */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND |SDF_CMD_READ ;
@@ -531,7 +531,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->cancel = das800_cancel;/* di */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->n_chan =3 ;
@@ -540,7 +540,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_bits = das800_di_rbits;/* do */ - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE |SDF_READABLE ; s->n_chan =4 ;
drivers/staging/comedi/drivers/dmm32at.c +3 -3
@@ -825,7 +825,7 @@ static int dmm32at_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s;/* analog input subdevice */ s->type =COMEDI_SUBD_AI ;
@@ -841,7 +841,7 @@ static int dmm32at_attach(struct comedi_device *dev, s->do_cmdtest = dmm32at_ai_cmdtest; s->cancel = dmm32at_ai_cancel; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* analog output subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -851,7 +851,7 @@ static int dmm32at_attach(struct comedi_device *dev, s->insn_write = dmm32at_ao_winsn; s->insn_read = dmm32at_ao_rinsn; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* digital i/o subdevice */ /* get access to the DIO regs */
drivers/staging/comedi/drivers/dt2801.c +3 -3
@@ -532,7 +532,7 @@ static int dt2801_dio_insn_bits(struct comedi_device *dev, {int which =0 ; -if (s == dev->subdevices +4 ) +if (s == &dev->subdevices[4 ]) which =1 ;if (data[0 ]) {
@@ -555,7 +555,7 @@ static int dt2801_dio_insn_config(struct comedi_device *dev, {int which =0 ; -if (s == dev->subdevices +4 ) +if (s == &dev->subdevices[4 ]) which =1 ;/* configure */
@@ -636,7 +636,7 @@ havetype: dev->board_name = boardtype.name; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* ai subdevice */ s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND ;
drivers/staging/comedi/drivers/dt2811.c +4 -4
@@ -510,7 +510,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)break ; } - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* initialize the ADC subdevice */ s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND ;
@@ -530,7 +530,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)break ; } - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* ao subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -542,7 +542,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it) devpriv->range_type_list[0 ] = dac_range_types[devpriv->dac_range[0 ]]; devpriv->range_type_list[1 ] = dac_range_types[devpriv->dac_range[1 ]]; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* di subdevice */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -551,7 +551,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->maxdata =1 ; s->range_table = &range_digital; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];/* do subdevice */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
drivers/staging/comedi/drivers/dt2814.c +2 -2
@@ -247,7 +247,7 @@ static irqreturn_t dt2814_interrupt(int irq, void *d)return IRQ_HANDLED ; } - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; hi =inb (dev->iobase +DT2814_DATA ); lo =inb (dev->iobase +DT2814_DATA );
@@ -346,7 +346,7 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret <0 )return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND |SDF_CMD_READ ;
drivers/staging/comedi/drivers/dt2815.c +1 -1
@@ -185,7 +185,7 @@ static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (alloc_private (dev,sizeof (struct dt2815_private )) <0 )return -ENOMEM ; - s = dev->subdevices; + s = &dev->subdevices[0 ];/* ao subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
drivers/staging/comedi/drivers/dt2817.c +1 -1
@@ -141,7 +141,7 @@ static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->n_chan =32 ; s->type =COMEDI_SUBD_DIO ;
drivers/staging/comedi/drivers/dt282x.c +5 -6
@@ -312,7 +312,7 @@ static void dt282x_ao_dma_interrupt(struct comedi_device *dev)void *ptr;int size;int i; -struct comedi_subdevice *s = dev->subdevices +1 ; +struct comedi_subdevice *s = &dev->subdevices[1 ];outw (devpriv->supcsr |DT2821_CLRDMADNE , dev->iobase +DT2821_SUPCSR );
@@ -345,7 +345,7 @@ static void dt282x_ai_dma_interrupt(struct comedi_device *dev)int size;int i;int ret; -struct comedi_subdevice *s = dev->subdevices; +struct comedi_subdevice *s = &dev->subdevices[0 ];outw (devpriv->supcsr |DT2821_CLRDMADNE , dev->iobase +DT2821_SUPCSR );
@@ -457,8 +457,8 @@ static irqreturn_t dt282x_interrupt(int irq, void *d)return IRQ_HANDLED ; } - s = dev->subdevices +0 ; - s_ao = dev->subdevices +1 ; + s = &dev->subdevices[0 ]; + s_ao = &dev->subdevices[1 ]; adcsr =inw (dev->iobase +DT2821_ADCSR ); dacsr =inw (dev->iobase +DT2821_DACSR ); supcsr =inw (dev->iobase +DT2821_SUPCSR );
@@ -1275,8 +1275,7 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; - + s = &dev->subdevices[0 ]; dev->read_subdev = s;/* ai subdevice */ s->type =COMEDI_SUBD_AI ;
drivers/staging/comedi/drivers/dt3000.c +2 -3
@@ -330,7 +330,7 @@ static irqreturn_t dt3k_interrupt(int irq, void *d)if (!dev->attached)return IRQ_NONE ; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; status =readw (devpriv->io_addr + DPR_Intr_Flag);#ifdef DEBUG debug_intr_flags (status);
@@ -842,9 +842,8 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices; + s = &dev->subdevices[0 ]; dev->read_subdev = s; -/* ai subdevice */ s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND |SDF_DIFF |SDF_CMD_READ ;
drivers/staging/comedi/drivers/dt9812.c +4 -4
@@ -1041,7 +1041,7 @@ static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it)return ret;/* digital input subdevice */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->n_chan =0 ;
@@ -1050,7 +1050,7 @@ static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_read = &dt9812_di_rinsn;/* digital output subdevice */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITEABLE ; s->n_chan =0 ;
@@ -1059,7 +1059,7 @@ static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_write = &dt9812_do_winsn;/* analog input subdevice */ - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND ; s->n_chan =0 ;
@@ -1068,7 +1068,7 @@ static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_read = &dt9812_ai_rinsn;/* analog output subdevice */ - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITEABLE ; s->n_chan =0 ;
drivers/staging/comedi/drivers/dyna_pci10xx.c +4 -4
@@ -208,7 +208,7 @@ static int dyna_pci10xx_attach_pci(struct comedi_device *dev,return ret;/* analog input */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND |SDF_DIFF ; s->n_chan =16 ;
@@ -218,7 +218,7 @@ static int dyna_pci10xx_attach_pci(struct comedi_device *dev, s->insn_read = dyna_pci10xx_insn_read_ai;/* analog output */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ; s->n_chan =16 ;
@@ -228,7 +228,7 @@ static int dyna_pci10xx_attach_pci(struct comedi_device *dev, s->insn_write = dyna_pci10xx_insn_write_ao;/* digital input */ - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE |SDF_GROUND ; s->n_chan =16 ;
@@ -238,7 +238,7 @@ static int dyna_pci10xx_attach_pci(struct comedi_device *dev, s->insn_bits = dyna_pci10xx_di_insn_bits;/* digital output */ - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND ; s->n_chan =16 ;
drivers/staging/comedi/drivers/fl512.c +2 -2
@@ -140,7 +140,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)* this if the definitions of the supdevices, 2 have been defined */ /* Analog indput */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* define subdevice as Analog In */ s->type =COMEDI_SUBD_AI ;/* you can read it from userspace */
@@ -156,7 +156,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)printk (KERN_INFO "comedi: fl512: subdevice 0 initialized\n" );/* Analog output */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* define subdevice as Analog OUT */ s->type =COMEDI_SUBD_AO ;/* you can write it from userspace */
drivers/staging/comedi/drivers/gsc_hpdi.c +1 -1
@@ -436,7 +436,7 @@ static int setup_subdevices(struct comedi_device *dev)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog input subdevice */ dev->read_subdev = s;/* dev->write_subdev = s; */
drivers/staging/comedi/drivers/icp_multi.c +5 -5
@@ -931,7 +931,7 @@ static int icp_multi_attach(struct comedi_device *dev, subdev =0 ;if (this_board->n_aichan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_COMMON |SDF_GROUND ;
@@ -946,7 +946,7 @@ static int icp_multi_attach(struct comedi_device *dev, }if (this_board->n_aochan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND |SDF_COMMON ; s->n_chan = this_board->n_aochan;
@@ -959,7 +959,7 @@ static int icp_multi_attach(struct comedi_device *dev, }if (this_board->n_dichan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->n_chan = this_board->n_dichan;
@@ -972,7 +972,7 @@ static int icp_multi_attach(struct comedi_device *dev, }if (this_board->n_dochan) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE |SDF_READABLE ; s->n_chan = this_board->n_dochan;
@@ -986,7 +986,7 @@ static int icp_multi_attach(struct comedi_device *dev, }if (this_board->n_ctrs) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_COUNTER ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND |SDF_COMMON ; s->n_chan = this_board->n_ctrs;
drivers/staging/comedi/drivers/ii_pci20kc.c +2 -2
@@ -224,7 +224,7 @@ static int pci20xxx_attach(struct comedi_device *dev, dev->minor, devpriv->ioaddr);for (i =0 ; i <PCI20000_MODULES ; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; id =readb (devpriv->ioaddr + (i +1 ) *PCI20000_OFFSET ); s->private = devpriv->subdev_private + i; sdp = s->private;
@@ -259,7 +259,7 @@ static int pci20xxx_attach(struct comedi_device *dev, }/* initialize struct pci20xxx_private */ -pci20xxx_dio_init (dev, dev->subdevices +PCI20000_MODULES ); +pci20xxx_dio_init (dev, &dev->subdevices[PCI20000_MODULES ]);return 1 ; }
drivers/staging/comedi/drivers/ke_counter.c +1 -1
@@ -145,7 +145,7 @@ static int cnt_attach_pci(struct comedi_device *dev,if (ret)return ret; - subdevice = dev->subdevices +0 ; + subdevice = &dev->subdevices[0 ]; dev->read_subdev = subdevice; subdevice->type =COMEDI_SUBD_COUNTER ;
drivers/staging/comedi/drivers/me4000.c +5 -5
@@ -1410,7 +1410,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id) {unsigned int tmp;struct comedi_device *dev = dev_id; -struct comedi_subdevice *s = dev->subdevices; +struct comedi_subdevice *s = &dev->subdevices[0 ];struct me4000_ai_context *ai_context = &info->ai_context;int i;int c =0 ;
@@ -2017,7 +2017,7 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)Analog input subdevice ========================================================================*/ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];if (thisboard->ai.count) { s->type =COMEDI_SUBD_AI ;
@@ -2055,7 +2055,7 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)Analog output subdevice ========================================================================*/ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];if (thisboard->ao.count) { s->type =COMEDI_SUBD_AO ;
@@ -2073,7 +2073,7 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)Digital I/O subdevice ========================================================================*/ - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];if (thisboard->dio.count) { s->type =COMEDI_SUBD_DIO ;
@@ -2100,7 +2100,7 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)Counter subdevice ========================================================================*/ - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];if (thisboard->cnt.count) { s->type =COMEDI_SUBD_COUNTER ;
drivers/staging/comedi/drivers/me_daq.c +3 -3
@@ -758,7 +758,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (error)return error; - subdevice = dev->subdevices +0 ; + subdevice = &dev->subdevices[0 ]; subdevice->type =COMEDI_SUBD_AI ; subdevice->subdev_flags =SDF_READABLE |SDF_COMMON |SDF_CMD_READ ; subdevice->n_chan = board->ai_channel_nbr;
@@ -770,7 +770,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it) subdevice->do_cmdtest = me_ai_do_cmd_test; subdevice->do_cmd = me_ai_do_cmd; - subdevice = dev->subdevices +1 ; + subdevice = &dev->subdevices[1 ]; subdevice->type =COMEDI_SUBD_AO ; subdevice->subdev_flags =SDF_WRITEABLE |SDF_COMMON ; subdevice->n_chan = board->ao_channel_nbr;
@@ -780,7 +780,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it) subdevice->insn_read = me_ao_insn_read; subdevice->insn_write = me_ao_insn_write; - subdevice = dev->subdevices +2 ; + subdevice = &dev->subdevices[2 ]; subdevice->type =COMEDI_SUBD_DIO ; subdevice->subdev_flags =SDF_READABLE |SDF_WRITEABLE ; subdevice->n_chan = board->dio_channel_nbr;
drivers/staging/comedi/drivers/mpc624.c +1 -1
@@ -353,7 +353,7 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_DIFF ; s->n_chan =8 ;
drivers/staging/comedi/drivers/mpc8260cpm.c +1 -1
@@ -137,7 +137,7 @@ static int mpc8260cpm_attach(struct comedi_device *dev,return ret;for (i =0 ; i <4 ; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =32 ;
drivers/staging/comedi/drivers/multiq3.c +5 -5
@@ -258,7 +258,7 @@ static int multiq3_attach(struct comedi_device *dev,if (result <0 )return result; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* ai subdevice */ s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND ;
@@ -267,7 +267,7 @@ static int multiq3_attach(struct comedi_device *dev, s->maxdata =0x1fff ; s->range_table = &range_bipolar5; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* ao subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -277,7 +277,7 @@ static int multiq3_attach(struct comedi_device *dev, s->maxdata =0xfff ; s->range_table = &range_bipolar5; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* di subdevice */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -286,7 +286,7 @@ static int multiq3_attach(struct comedi_device *dev, s->maxdata =1 ; s->range_table = &range_digital; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];/* do subdevice */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
@@ -296,7 +296,7 @@ static int multiq3_attach(struct comedi_device *dev, s->range_table = &range_digital; s->state =0 ; - s = dev->subdevices +4 ; + s = &dev->subdevices[4 ];/* encoder (counter) subdevice */ s->type =COMEDI_SUBD_COUNTER ; s->subdev_flags =SDF_READABLE |SDF_LSAMPL ;
drivers/staging/comedi/drivers/ni_6527.c +4 -4
@@ -212,7 +212,7 @@ static int ni6527_do_insn_bits(struct comedi_device *dev,static irqreturn_t ni6527_interrupt (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +2 ; +struct comedi_subdevice *s = &dev->subdevices[2 ];unsigned int status; status =readb (devpriv->mite->daq_io_addr + Change_Status);
@@ -393,7 +393,7 @@ static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->n_chan =24 ;
@@ -402,7 +402,7 @@ static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_config = ni6527_di_insn_config; s->insn_bits = ni6527_di_insn_bits; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =24 ;
@@ -410,7 +410,7 @@ static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->maxdata =1 ; s->insn_bits = ni6527_do_insn_bits; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE |SDF_CMD_READ ;
drivers/staging/comedi/drivers/ni_65xx.c +5 -5
@@ -478,7 +478,7 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev,static irqreturn_t ni_65xx_interrupt (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +2 ; +struct comedi_subdevice *s = &dev->subdevices[2 ];unsigned int status; status =readb (private (dev)->mite->daq_io_addr + Change_Status);
@@ -678,7 +678,7 @@ static int ni_65xx_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];if (board (dev)->num_di_ports) { s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -696,7 +696,7 @@ static int ni_65xx_attach(struct comedi_device *dev, s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];if (board (dev)->num_do_ports) { s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ;
@@ -713,7 +713,7 @@ static int ni_65xx_attach(struct comedi_device *dev, s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];if (board (dev)->num_dio_ports) { s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ;
@@ -737,7 +737,7 @@ static int ni_65xx_attach(struct comedi_device *dev, s->type =COMEDI_SUBD_UNUSED ; } - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE |SDF_CMD_READ ;
drivers/staging/comedi/drivers/ni_660x.c +4 -4
@@ -985,7 +985,7 @@ static irqreturn_t ni_660x_interrupt(int irq, void *d)spin_lock_irqsave (&private (dev)->interrupt_lock, flags);smp_mb ();for (i =0 ; i <ni_660x_num_counters (dev); ++i) { - s = dev->subdevices +NI_660X_GPCT_SUBDEV (i); + s = &dev->subdevices[NI_660X_GPCT_SUBDEV (i)];ni_660x_handle_gpct_interrupt (dev, s); }spin_unlock_irqrestore (&private (dev)->interrupt_lock, flags);
@@ -1097,11 +1097,11 @@ static int ni_660x_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* Old GENERAL-PURPOSE COUNTER/TIME (GPCT) subdevice, no longer used */ s->type =COMEDI_SUBD_UNUSED ; - s = dev->subdevices +NI_660X_DIO_SUBDEV ; + s = &dev->subdevices[NI_660X_DIO_SUBDEV ];/* DIGITAL I/O SUBDEVICE */ s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ;
@@ -1124,7 +1124,7 @@ static int ni_660x_attach(struct comedi_device *dev,if (private (dev)->counter_dev ==NULL )return -ENOMEM ;for (i =0 ; i <NI_660X_MAX_NUM_COUNTERS ; ++i) { - s = dev->subdevices +NI_660X_GPCT_SUBDEV (i); + s = &dev->subdevices[NI_660X_GPCT_SUBDEV (i)];if (i <ni_660x_num_counters (dev)) { s->type =COMEDI_SUBD_COUNTER ; s->subdev_flags =
drivers/staging/comedi/drivers/ni_670x.c +3 -3
@@ -247,7 +247,7 @@ static int ni_670x_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog output subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -271,7 +271,7 @@ static int ni_670x_attach(struct comedi_device *dev, s->insn_write = &ni_670x_ao_winsn; s->insn_read = &ni_670x_ao_rinsn; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* digital i/o subdevice */ s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ;
@@ -298,7 +298,7 @@ static void ni_670x_detach(struct comedi_device *dev)struct comedi_subdevice *s;if (dev->n_subdevices) { - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];if (s)kfree (s->range_table_list); }
drivers/staging/comedi/drivers/ni_at_a2150.c +1 -1
@@ -832,7 +832,7 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)return ret;/* analog input subdevice */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND |SDF_OTHER |SDF_CMD_READ ;
drivers/staging/comedi/drivers/ni_at_ao.c +4 -4
@@ -358,7 +358,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* analog output subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -371,7 +371,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_write = &atao_ao_winsn; s->insn_read = &atao_ao_rinsn; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* digital i/o subdevice */ s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ;
@@ -381,7 +381,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_bits = atao_dio_insn_bits; s->insn_config = atao_dio_insn_config; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* caldac subdevice */ s->type =COMEDI_SUBD_CALIB ; s->subdev_flags =SDF_WRITABLE |SDF_INTERNAL ;
@@ -390,7 +390,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_read = atao_calib_insn_read; s->insn_write = atao_calib_insn_write; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];/* eeprom subdevice */ /* s->type=COMEDI_SUBD_EEPROM; */ s->type =COMEDI_SUBD_UNUSED ;
drivers/staging/comedi/drivers/ni_atmio16d.c +3 -3
@@ -234,7 +234,7 @@ static void reset_atmio16d(struct comedi_device *dev)static irqreturn_t atmio16d_interrupt (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];comedi_buf_put (s->async,inw (dev->iobase +AD_FIFO_REG ));
@@ -724,7 +724,7 @@ static int atmio16d_attach(struct comedi_device *dev, devpriv->dac1_coding = it->options[12 ];/* setup sub-devices */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s;/* ai subdevice */ s->type =COMEDI_SUBD_AI ;
@@ -809,7 +809,7 @@ static void atmio16d_detach(struct comedi_device *dev)const struct atmio16_board_t *board =comedi_board (dev);if (dev->subdevices && board->has_8255) -subdev_8255_cleanup (dev, dev->subdevices +3 ); +subdev_8255_cleanup (dev, &dev->subdevices[3 ]);if (dev->irq)free_irq (dev->irq, dev);reset_atmio16d (dev);
drivers/staging/comedi/drivers/ni_daq_700.c +1 -1
@@ -121,7 +121,7 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)return ret;/* DAQCard-700 dio */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =16 ;
drivers/staging/comedi/drivers/ni_daq_dio24.c +2 -2
@@ -164,7 +164,7 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)return ret;/* 8255 dio */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];subdev_8255_init (dev, s,NULL , dev->iobase);return 0 ;
@@ -173,7 +173,7 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)static void dio24_detach (struct comedi_device *dev) {if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +0 ); +subdev_8255_cleanup (dev, &dev->subdevices[0 ]);if (thisboard->bustype != pcmcia_bustype && dev->iobase)release_region (dev->iobase,DIO24_SIZE );if (dev->irq)
drivers/staging/comedi/drivers/ni_labpc.c +6 -6
@@ -628,7 +628,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,return ret;/* analog input subdevice */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =
@@ -643,7 +643,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, s->cancel = labpc_cancel;/* analog output */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];if (thisboard->has_ao) {/* * Could provide command support, except it only has a
@@ -670,7 +670,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, }/* 8255 dio */ - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* if board uses io memory we have to give a custom callback * function to the 8255 driver */ if (thisboard->memory_mapped_io)
@@ -680,7 +680,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,subdev_8255_init (dev, s,NULL , dev->iobase +DIO_BASE_REG );/* calibration subdevices for boards that have one */ - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];if (thisboard->register_layout == labpc_1200_layout) { s->type =COMEDI_SUBD_CALIB ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_INTERNAL ;
@@ -695,7 +695,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, s->type =COMEDI_SUBD_UNUSED ;/* EEPROM */ - s = dev->subdevices +4 ; + s = &dev->subdevices[4 ];if (thisboard->register_layout == labpc_1200_layout) { s->type =COMEDI_SUBD_MEMORY ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_INTERNAL ;
@@ -810,7 +810,7 @@ static int labpc_find_device(struct comedi_device *dev, int bus, int slot)void labpc_common_detach (struct comedi_device *dev) {if (dev->subdevices) -subdev_8255_cleanup (dev, dev->subdevices +2 ); +subdev_8255_cleanup (dev, &dev->subdevices[2 ]);#ifdef CONFIG_ISA_DMA_API /* only free stuff if it has been allocated by _attach */ kfree (devpriv->dma_buffer);
drivers/staging/comedi/drivers/ni_mio_common.c +31 -30
232 lines not on this page · raw message
drivers/staging/comedi/drivers/ni_pcidio.c +4 -4
@@ -480,7 +480,7 @@ static int ni_pcidio_poll(struct comedi_device *dev, struct comedi_subdevice *s)static irqreturn_t nidio_interrupt (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices; +struct comedi_subdevice *s = &dev->subdevices[0 ];struct comedi_async *async = s->async;struct mite_struct *mite = devpriv->mite;
@@ -1252,7 +1252,7 @@ static int nidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (!this_board->is_diodaq) {for (i =0 ; i < this_board->n_8255; i++) { - subdev_8255_init(dev, dev->subdevices + i, + subdev_8255_init(dev, &dev->subdevices[i], nidio96_8255_cb, (unsigned long)(devpriv->mite-> daq_io_addr +
@@ -1263,7 +1263,7 @@ static int nidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)printk (KERN_INFO " rev=%d" ,readb (devpriv->mite->daq_io_addr + Chip_Version)); - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s; s->type =COMEDI_SUBD_DIO ;
@@ -1311,7 +1311,7 @@ static void nidio_detach(struct comedi_device *dev)if (this_board && !this_board->is_diodaq) {for (i =0 ; i < this_board->n_8255; i++) -subdev_8255_cleanup (dev, dev->subdevices + i); +subdev_8255_cleanup (dev, &dev->subdevices[i]); }if (dev->irq)free_irq (dev->irq, dev);
drivers/staging/comedi/drivers/pcl711.c +2 -2
@@ -168,7 +168,7 @@ static irqreturn_t pcl711_interrupt(int irq, void *d)int data;struct comedi_device *dev = d;const struct pcl711_board *board =comedi_board (dev); -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];if (!dev->attached) {comedi_error (dev,"spurious interrupt" );
@@ -520,7 +520,7 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret <0 )return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* AI subdevice */ s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND ;
drivers/staging/comedi/drivers/pcl724.c +3 -3
@@ -162,12 +162,12 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it)for (i =0 ; i < dev->n_subdevices; i++) {if (board->is_pet48) { -subdev_8255_init (dev, dev->subdevices + i, +subdev_8255_init (dev, &dev->subdevices[i], subdev_8255mapped_cb, (unsigned long )(dev->iobase + i *0x1000 )); }else -subdev_8255_init (dev, dev->subdevices + i, +subdev_8255_init (dev, &dev->subdevices[i], subdev_8255_cb, (unsigned long )(dev->iobase +SIZE_8255 * i));
@@ -182,7 +182,7 @@ static void pcl724_detach(struct comedi_device *dev)int i;for (i =0 ; i < dev->n_subdevices; i++) -subdev_8255_cleanup (dev, dev->subdevices + i); +subdev_8255_cleanup (dev, &dev->subdevices[i]);#ifdef PCL724_IRQ if (dev->irq)free_irq (dev->irq, dev);
drivers/staging/comedi/drivers/pcl725.c +2 -2
@@ -62,7 +62,7 @@ static int pcl725_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* do */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
@@ -71,7 +71,7 @@ static int pcl725_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_bits = pcl725_do_insn; s->range_table = &range_digital; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* di */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
drivers/staging/comedi/drivers/pcl726.c +3 -3
@@ -290,7 +290,7 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* ao */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND ;
@@ -316,7 +316,7 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it) devpriv->bipolar[i] =1 ;/* bipolar range */ } - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* di */ if (!board->have_dio) { s->type =COMEDI_SUBD_UNUSED ;
@@ -330,7 +330,7 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table = &range_digital; } - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* do */ if (!board->have_dio) { s->type =COMEDI_SUBD_UNUSED ;
drivers/staging/comedi/drivers/pcl730.c +4 -4
@@ -84,7 +84,7 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* Isolated do */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
@@ -94,7 +94,7 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table = &range_digital; s->private = (void *)PCL730_IDIO_LO ; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* Isolated di */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -104,7 +104,7 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table = &range_digital; s->private = (void *)PCL730_IDIO_LO ; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* TTL do */ s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ;
@@ -114,7 +114,7 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table = &range_digital; s->private = (void *)PCL730_DIO_LO ; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];/* TTL di */ s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
drivers/staging/comedi/drivers/pcl812.c +6 -6
@@ -806,7 +806,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)char err =1 ;unsigned int mask, timeout;struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];unsigned int next_chan; s->async->events =0 ;
@@ -909,7 +909,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,static irqreturn_t interrupt_pcl812_ai_dma (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];unsigned long dma_flags;int len, bufptr;short *ptr;
@@ -1267,7 +1267,7 @@ no_dma:/* analog input */ if (board->n_aichan >0 ) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE ;switch (board->board_type) {
@@ -1409,7 +1409,7 @@ no_dma:/* analog output */ if (board->n_aochan >0 ) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND ; s->n_chan = board->n_aochan;
@@ -1438,7 +1438,7 @@ no_dma:/* digital input */ if (board->n_dichan >0 ) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->n_chan = board->n_dichan;
@@ -1451,7 +1451,7 @@ no_dma:/* digital output */ if (board->n_dochan >0 ) { - s = dev->subdevices + subdev; + s = &dev->subdevices[subdev]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ; s->n_chan = board->n_dochan;
drivers/staging/comedi/drivers/pcl816.c +3 -3
@@ -258,7 +258,7 @@ static int pcl816_ai_insn_read(struct comedi_device *dev,static irqreturn_t interrupt_pcl816_ai_mode13_int (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];int low, hi;int timeout =50 ;/* wait max 50us */
@@ -349,7 +349,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,static irqreturn_t interrupt_pcl816_ai_mode13_dma (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];int len, bufptr, this_dma_buf;unsigned long dma_flags;short *ptr;
@@ -1183,7 +1183,7 @@ no_dma:if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];if (board->n_aichan >0 ) { s->type =COMEDI_SUBD_AI ; devpriv->sub_ai = s;
drivers/staging/comedi/drivers/pcl818.c +9 -9
@@ -477,7 +477,7 @@ static int pcl818_do_insn_bits(struct comedi_device *dev,static irqreturn_t interrupt_pcl818_ai_mode13_int (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];int low;int timeout =50 ;/* wait max 50us */
@@ -536,7 +536,7 @@ conv_finish:static irqreturn_t interrupt_pcl818_ai_mode13_dma (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];int i, len, bufptr;unsigned long flags;short *ptr;
@@ -615,7 +615,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d)static irqreturn_t interrupt_pcl818_ai_mode13_dma_rtc (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];unsigned long tmp;unsigned int top1, top2, i, bufptr;long ofs_dats;
@@ -720,7 +720,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma_rtc(int irq, void *d)static irqreturn_t interrupt_pcl818_ai_mode13_fifo (int irq,void *d) {struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ];int i, len, lo;outb (0 , dev->iobase +PCL818_FI_INTCLR );/* clear fifo int request */
@@ -811,7 +811,7 @@ static irqreturn_t interrupt_pcl818(int irq, void *d)being reprogrammed while a DMA transfer is in progress. */ -struct comedi_subdevice *s = dev->subdevices +0 ; +struct comedi_subdevice *s = &dev->subdevices[0 ]; devpriv->ai_act_scan =0 ; devpriv->neverending_ai =0 ;pcl818_ai_cancel (dev, s);
@@ -1763,7 +1763,7 @@ no_dma:if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];if (!board->n_aichan_se) { s->type =COMEDI_SUBD_UNUSED ; }else {
@@ -1829,7 +1829,7 @@ no_dma: } } - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];if (!board->n_aochan) { s->type =COMEDI_SUBD_UNUSED ; }else {
@@ -1862,7 +1862,7 @@ no_dma: } } - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];if (!board->n_dichan) { s->type =COMEDI_SUBD_UNUSED ; }else {
@@ -1875,7 +1875,7 @@ no_dma: s->insn_bits = pcl818_di_insn_bits; } - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ];if (!board->n_dochan) { s->type =COMEDI_SUBD_UNUSED ; }else {
drivers/staging/comedi/drivers/pcm3724.c +9 -7
@@ -136,10 +136,10 @@ static void do_3724_config(struct comedi_device *dev,if (!(s->io_bits &0xff0000 )) config |=CR_C_IO ; - buffer_config =compute_buffer (0 ,0 , dev->subdevices); - buffer_config =compute_buffer (buffer_config,1 , (dev->subdevices) +1 ); + buffer_config =compute_buffer (0 ,0 , &dev->subdevices[0 ]); + buffer_config =compute_buffer (buffer_config,1 , &dev->subdevices[1 ]); -if (s == dev->subdevices) +if (s == &dev->subdevices[0 ]) port_8255_cfg = dev->iobase + _8255_CR;else port_8255_cfg = dev->iobase +SIZE_8255 + _8255_CR;
@@ -162,7 +162,7 @@ static void enable_chan(struct comedi_device *dev, struct comedi_subdevice *s, priv = dev->private; mask =1 <<CR_CHAN (chanspec); -if (s == dev->subdevices)/* subdev 0 */ +if (s == &dev->subdevices[0 ]) priv->dio_1 |= mask;else /* subdev 1 */ priv->dio_2 |= mask;
@@ -231,6 +231,7 @@ static int pcm3724_attach(struct comedi_device *dev, struct comedi_devconfig *it) {const struct pcm3724_board *board =comedi_board (dev); +struct comedi_subdevice *s;unsigned long iobase;unsigned int iorange;int ret, i, n_subdevices;
@@ -263,9 +264,10 @@ static int pcm3724_attach(struct comedi_device *dev,return ret;for (i =0 ; i < dev->n_subdevices; i++) { -subdev_8255_init (dev, dev->subdevices + i, subdev_8255_cb, + s = &dev->subdevices[i]; +subdev_8255_init (dev, s, subdev_8255_cb, (unsigned long )(dev->iobase +SIZE_8255 * i)); - ((dev->subdevices) + i)->insn_config = subdev_3724_insn_config; + s->insn_config = subdev_3724_insn_config; }return 0 ; }
@@ -277,7 +279,7 @@ static void pcm3724_detach(struct comedi_device *dev)if (dev->subdevices) {for (i =0 ; i < dev->n_subdevices; i++) -subdev_8255_cleanup (dev, dev->subdevices + i); +subdev_8255_cleanup (dev, &dev->subdevices[i]); }if (dev->iobase)release_region (dev->iobase, board->io_range);
drivers/staging/comedi/drivers/pcm3730.c +6 -6
@@ -72,7 +72,7 @@ static int pcm3730_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ; s->maxdata =1 ;
@@ -81,7 +81,7 @@ static int pcm3730_attach(struct comedi_device *dev, s->range_table = &range_digital; s->private = (void *)PCM3730_DOA ; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ; s->maxdata =1 ;
@@ -90,7 +90,7 @@ static int pcm3730_attach(struct comedi_device *dev, s->range_table = &range_digital; s->private = (void *)PCM3730_DOB ; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITABLE ; s->maxdata =1 ;
@@ -99,7 +99,7 @@ static int pcm3730_attach(struct comedi_device *dev, s->range_table = &range_digital; s->private = (void *)PCM3730_DOC ; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->maxdata =1 ;
@@ -108,7 +108,7 @@ static int pcm3730_attach(struct comedi_device *dev, s->range_table = &range_digital; s->private = (void *)PCM3730_DIA ; - s = dev->subdevices +4 ; + s = &dev->subdevices[4 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->maxdata =1 ;
@@ -117,7 +117,7 @@ static int pcm3730_attach(struct comedi_device *dev, s->range_table = &range_digital; s->private = (void *)PCM3730_DIB ; - s = dev->subdevices +5 ; + s = &dev->subdevices[5 ]; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ; s->maxdata =1 ;
drivers/staging/comedi/drivers/pcmad.c +1 -1
@@ -127,7 +127,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it) dev->board_name = board->name; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |AREF_GROUND ; s->n_chan =16 ;/* XXX */
drivers/staging/comedi/drivers/pcmda12.c +1 -1
@@ -195,7 +195,7 @@ static int pcmda12_attach(struct comedi_device *dev,if (ret)return ret; - s = dev->subdevices; + s = &dev->subdevices[0 ]; s->private =NULL ; s->maxdata = (0x1 <<BITS ) -1 ; s->range_table = &pcmda12_ranges;
drivers/staging/comedi/drivers/pcmmio.c +8 -6
@@ -576,6 +576,8 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)if (triggered) {struct comedi_subdevice *s; +int subdev; +/* * TODO here: dispatch io lines to subdevs * with commands..
@@ -583,9 +585,9 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)printk (KERN_DEBUG "got edge detect interrupt %d asic %d which_chans: %06x\n" , irq, asic, triggered); -for (s = dev->subdevices +2 ; - s < dev->subdevices + dev->n_subdevices; - ++s) { +for (subdev =2 ; subdev < dev->n_subdevices; + subdev++) { + s = &dev->subdevices[subdev];/* * this is an interrupt subdev, * and it matches this asic!
@@ -1077,7 +1079,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)/* First, AI */ sdev_no =0 ; - s = dev->subdevices + sdev_no; + s = &dev->subdevices[sdev_no]; s->private = devpriv->sprivs + sdev_no; s->maxdata = (1 << board->ai_bits) -1 ; s->range_table = board->ai_range_table;
@@ -1093,7 +1095,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)/* Next, AO */ ++sdev_no; - s = dev->subdevices + sdev_no; + s = &dev->subdevices[sdev_no]; s->private = devpriv->sprivs + sdev_no; s->maxdata = (1 << board->ao_bits) -1 ; s->range_table = board->ao_range_table;
@@ -1114,7 +1116,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)for (; sdev_no < (int )dev->n_subdevices; ++sdev_no) {int byte_no; - s = dev->subdevices + sdev_no; + s = &dev->subdevices[sdev_no]; s->private = devpriv->sprivs + sdev_no; s->maxdata =1 ; s->range_table = &range_digital;
drivers/staging/comedi/drivers/pcmuio.c +6 -4
@@ -503,13 +503,15 @@ static irqreturn_t interrupt_pcmuio(int irq, void *d)if (triggered) {struct comedi_subdevice *s; +int subdev; +/* TODO here: dispatch io lines to subdevs with commands.. */ printk ("PCMUIO DEBUG: got edge detect interrupt %d asic %d which_chans: %06x\n" , irq, asic, triggered); -for (s = dev->subdevices; - s < dev->subdevices + dev->n_subdevices; - ++s) { +for (subdev =0 ; subdev < dev->n_subdevices; + subdev++) { + s = &dev->subdevices[subdev];if (subpriv->intr.asic == asic) {/* this is an interrupt subdev, and it matches this asic! */ unsigned long flags;unsigned oldevents;
@@ -811,7 +813,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)for (sdev_no =0 ; sdev_no < (int )dev->n_subdevices; ++sdev_no) {int byte_no; - s = dev->subdevices + sdev_no; + s = &dev->subdevices[sdev_no]; s->private = devpriv->sprivs + sdev_no; s->maxdata =1 ; s->range_table = &range_digital;
drivers/staging/comedi/drivers/poc.c +1 -1
@@ -164,7 +164,7 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)return -ENOMEM ;/* analog output subdevice */ - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; s->type = board->type; s->n_chan = board->n_chan; s->maxdata = (1 << board->n_bits) -1 ;
drivers/staging/comedi/drivers/quatech_daqp_cs.c +4 -4
@@ -878,7 +878,7 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it)printk (KERN_INFO "comedi%d: attaching daqp%d (io 0x%04lx)\n" , dev->minor, it->options[0 ], dev->iobase); - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s; s->private = local; s->type =COMEDI_SUBD_AI ;
@@ -892,7 +892,7 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->do_cmd = daqp_ai_cmd; s->cancel = daqp_ai_cancel; - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ]; dev->write_subdev = s; s->private = local; s->type =COMEDI_SUBD_AO ;
@@ -903,7 +903,7 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table = &range_daqp_ao; s->insn_write = daqp_ao_insn_write; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ]; s->private = local; s->type =COMEDI_SUBD_DI ; s->subdev_flags =SDF_READABLE ;
@@ -911,7 +911,7 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->len_chanlist =1 ; s->insn_read = daqp_di_insn_read; - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->private = local; s->type =COMEDI_SUBD_DO ; s->subdev_flags =SDF_WRITEABLE ;
drivers/staging/comedi/drivers/rtd520.c +5 -5
@@ -783,7 +783,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */ void *d) {/* our data *//* cpu context (ignored) */ struct comedi_device *dev = d; -struct comedi_subdevice *s = dev->subdevices +0 ;/* analog in subdevice */ +struct comedi_subdevice *s = &dev->subdevices[0 ];/* ai subdevice */ struct rtdPrivate *devpriv = dev->private;u32 overrun;u16 status;
@@ -1706,7 +1706,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ]; dev->read_subdev = s;/* analog input subdevice */ s->type =COMEDI_SUBD_AI ;
@@ -1726,7 +1726,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->cancel = rtd_ai_cancel;/* s->poll = rtd_ai_poll; *//* not ready yet */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* analog output subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
@@ -1736,7 +1736,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_write = rtd_ao_winsn; s->insn_read = rtd_ao_rinsn; - s = dev->subdevices +2 ; + s = &dev->subdevices[2 ];/* digital i/o subdevice */ s->type =COMEDI_SUBD_DIO ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ;
@@ -1748,7 +1748,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_config = rtd_dio_insn_config;/* timer/counter subdevices (not currently supported) */ - s = dev->subdevices +3 ; + s = &dev->subdevices[3 ]; s->type =COMEDI_SUBD_COUNTER ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE ; s->n_chan =3 ;
drivers/staging/comedi/drivers/rti800.c +1 -1
@@ -360,7 +360,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) devpriv->dac1_coding = it->options[8 ]; devpriv->muxgain_bits =-1 ; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* ai subdevice */ s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_GROUND ;
drivers/staging/comedi/drivers/rti802.c +1 -1
@@ -111,7 +111,7 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices; + s = &dev->subdevices[0 ];/* ao subdevice */ s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE ;
drivers/staging/comedi/drivers/s526.c +4 -4
@@ -768,7 +768,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - s = dev->subdevices +0 ; + s = &dev->subdevices[0 ];/* GENERAL-PURPOSE COUNTER/TIME (GPCT) */ s->type =COMEDI_SUBD_COUNTER ; s->subdev_flags =SDF_READABLE |SDF_WRITABLE |SDF_LSAMPL ;
@@ -786,7 +786,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)/* s->do_cmdtest = s526_gpct_cmdtest; */ /* s->cancel = s526_gpct_cancel; */ - s = dev->subdevices +1 ; + s = &dev->subdevices[1 ];/* dev->read_subdev=s; */
Lines of this file are not shown. View the raw message.
drivers/staging/comedi/drivers/s626.c +32 -41
73 lines not on this page · raw message
drivers/staging/comedi/drivers/serial2002.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/staging/comedi/drivers/ssv_dnp.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/comedi/drivers/usbdux.c +8 -8
Lines of this file are not shown. View the raw message.
drivers/staging/comedi/drivers/usbduxfast.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/staging/comedi/drivers/usbduxsigma.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/staging/comedi/drivers/vmk80xx.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/staging/comedi/kcomedilib/kcomedilib_main.c +2 -2
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.11
Part of the diff is not shown here. View the raw message.
Greg KH
maintainerQuoted 6 lines · H Hartley Sweeten
Convert all the
comedi_subdevicepointer access from pointer math to array access.Signed-off-by H Hartley Sweeten <[email protected]>Cc Dan Carpenter <[email protected]>Cc Ian Abbott <[email protected]>
This patch doesn't seem to apply, care to break it up into smaller pieces, and also fold in your "fix the build" patch as well? That way we have a chance to get it applied :)
thanks,
greg k-h
Quoted 11 lines · Greg KH
Quoted 6 lines · H Hartley Sweeten
Convert all the
comedi_subdevicepointer access from pointer math to array access.Signed-off-by H Hartley Sweeten <[email protected]>Cc Dan Carpenter <[email protected]>Cc Ian Abbott <[email protected]>This patch doesn't seem to apply, care to break it up into smaller pieces, and also fold in your "fix the build" patch as well? That way we have a chance to get it applied :)
Not a problem. Thanks!
Hartley