Skip to content

Commit

Permalink
staging: comedi: fix return value for insn_bits functions
Browse files Browse the repository at this point in the history 
The comedi_subdevice 'insn_bits' functions return the number of data
elements used to perform the command. Most of the insn_bits functions
return an open coded '2' to indicate this. The same value is available
as 'insn->n'. Return that instead to better indicate what the return
means.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 19, 2012
1 parent 5207066 commit a2714e3
Show file tree
Hide file tree
Showing 63 changed files with 107 additions and 107 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/acl7225b.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static int acl7225b_do_insn(struct comedi_device *dev,

data[1] = s->state;

return 2;
return insn->n;
}

static int acl7225b_di_insn(struct comedi_device *dev,
Expand All @@ -53,7 +53,7 @@ static int acl7225b_di_insn(struct comedi_device *dev,
data[1] = inb(dev->iobase + (unsigned long)s->private) |
(inb(dev->iobase + (unsigned long)s->private + 1) << 8);

return 2;
return insn->n;
}

static int acl7225b_attach(struct comedi_device *dev,
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adl_pci6208.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static int pci6208_ao_rinsn(struct comedi_device *dev,
* it was a purely digital output subdevice */
/* data[1]=s->state; */

/* return 2; */
/* return insn->n; */
/* } */

/* static int pci6208_dio_insn_config(struct comedi_device *dev,
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/adl_pci7230.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static int adl_pci7230_do_insn_bits(struct comedi_device *dev,
outl((s->state << 16) & 0xffffffff, dev->iobase + PCI7230_DO);
}

return 2;
return insn->n;
}

static int adl_pci7230_di_insn_bits(struct comedi_device *dev,
Expand All @@ -71,7 +71,7 @@ static int adl_pci7230_di_insn_bits(struct comedi_device *dev,
{
data[1] = inl(dev->iobase + PCI7230_DI) & 0xffffffff;

return 2;
return insn->n;
}

static struct pci_dev *adl_pci7230_find_pci(struct comedi_device *dev,
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/adl_pci7432.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static int adl_pci7432_do_insn_bits(struct comedi_device *dev,
dev->iobase + PCI7432_DO);
outl(s->state & 0xffffffff, dev->iobase + PCI7432_DO);
}
return 2;
return insn->n;
}

static int adl_pci7432_di_insn_bits(struct comedi_device *dev,
Expand All @@ -79,7 +79,7 @@ static int adl_pci7432_di_insn_bits(struct comedi_device *dev,
data[1] = inl(dev->iobase + PCI7432_DI) & 0xffffffff;
printk(KERN_DEBUG "comedi: data1 %8x\n", data[1]);

return 2;
return insn->n;
}

static struct pci_dev *adl_pci7432_find_pci(struct comedi_device *dev,
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/adl_pci9111.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ static int pci9111_di_insn_bits(struct comedi_device *dev,
bits = pci9111_di_get_bits();
data[1] = bits;

return 2;
return insn->n;
}

/* Digital outputs */
Expand All @@ -1179,7 +1179,7 @@ static int pci9111_do_insn_bits(struct comedi_device *dev,

data[1] = bits;

return 2;
return insn->n;
}

/* ------------------------------------------------------------------ */
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/adl_pci9118.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ static int pci9118_insn_bits_di(struct comedi_device *dev,
{
data[1] = inl(dev->iobase + PCI9118_DI) & 0xf;

return 2;
return insn->n;
}

/*
Expand All @@ -509,7 +509,7 @@ static int pci9118_insn_bits_do(struct comedi_device *dev,
}
data[1] = s->state;

return 2;
return insn->n;
}

/*
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/adq12b.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ static int adq12b_di_insn_bits(struct comedi_device *dev,
/* only bits 0-4 have information about digital inputs */
data[1] = (inb(dev->iobase + ADQ12B_STINR) & (0x1f));

return 2;
return insn->n;
}

static int adq12b_do_insn_bits(struct comedi_device *dev,
Expand All @@ -215,7 +215,7 @@ static int adq12b_do_insn_bits(struct comedi_device *dev,

data[1] = devpriv->digital_state;

return 2;
return insn->n;
}

static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/adv_pci1710.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ static int pci171x_insn_bits_di(struct comedi_device *dev,
{
data[1] = inw(dev->iobase + PCI171x_DI);

return 2;
return insn->n;
}

/*
Expand All @@ -452,7 +452,7 @@ static int pci171x_insn_bits_do(struct comedi_device *dev,
}
data[1] = s->state;

return 2;
return insn->n;
}

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adv_pci1723.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ static int pci1723_dio_insn_bits(struct comedi_device *dev,
outw(s->state, dev->iobase + PCI1723_WRITE_DIGITAL_OUTPUT_CMD);
}
data[1] = inw(dev->iobase + PCI1723_READ_DIGITAL_INPUT_DATA);
return 2;
return insn->n;
}

static int pci1723_attach(struct comedi_device *dev,
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/comedi/drivers/adv_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ static int pci_dio_insn_bits_di_b(struct comedi_device *dev,
data[1] |= inb(dev->iobase + d->addr + i) << (8 * i);


return 2;
return insn->n;
}

/*
Expand All @@ -441,7 +441,7 @@ static int pci_dio_insn_bits_di_w(struct comedi_device *dev,
for (i = 0; i < d->regs; i++)
data[1] |= inw(dev->iobase + d->addr + 2 * i) << (16 * i);

return 2;
return insn->n;
}

/*
Expand All @@ -463,7 +463,7 @@ static int pci_dio_insn_bits_do_b(struct comedi_device *dev,
}
data[1] = s->state;

return 2;
return insn->n;
}

/*
Expand All @@ -485,7 +485,7 @@ static int pci_dio_insn_bits_do_w(struct comedi_device *dev,
}
data[1] = s->state;

return 2;
return insn->n;
}

/*
Expand Down Expand Up @@ -634,7 +634,7 @@ static int pci1760_insn_bits_di(struct comedi_device *dev,
{
data[1] = inb(dev->iobase + IMB3);

return 2;
return insn->n;
}

/*
Expand Down Expand Up @@ -663,7 +663,7 @@ static int pci1760_insn_bits_do(struct comedi_device *dev,
}
data[1] = s->state;

return 2;
return insn->n;
}

/*
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/aio_iiro_16.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static int aio_iiro_16_dio_insn_bits_write(struct comedi_device *dev,

data[1] = s->state;

return 2;
return insn->n;
}

static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev,
Expand All @@ -92,7 +92,7 @@ static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev,
data[1] |= inb(dev->iobase + AIO_IIRO_16_INPUT_0_7);
data[1] |= inb(dev->iobase + AIO_IIRO_16_INPUT_8_15) << 8;

return 2;
return insn->n;
}

static int aio_iiro_16_attach(struct comedi_device *dev,
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/amplc_dio200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ dio200_subdev_intr_insn_bits(struct comedi_device *dev,
data[0] = 0;
}

return 2;
return insn->n;
}

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/amplc_pc236.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static int pc236_intr_insn(struct comedi_device *dev,
unsigned int *data)
{
data[1] = 0;
return 2;
return insn->n;
}

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/amplc_pc263.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ static int pc263_do_insn_bits(struct comedi_device *dev,
outb(s->state & 0xFF, dev->iobase);
outb(s->state >> 8, dev->iobase + 1);
}
return 2;
return insn->n;
}

static void pc263_report_attach(struct comedi_device *dev)
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/cb_das16_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ static int das16cs_dio_insn_bits(struct comedi_device *dev,
* input and output lines. */
data[1] = inw(dev->iobase + 16);

return 2;
return insn->n;
}

static int das16cs_dio_insn_config(struct comedi_device *dev,
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/comedi/drivers/cb_pcidas64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3617,7 +3617,7 @@ static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
data[1] = bits;
data[0] = 0;

return 2;
return insn->n;
}

static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
Expand All @@ -3633,7 +3633,7 @@ static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,

data[1] = s->state;

return 2;
return insn->n;
}

static int dio_60xx_config_insn(struct comedi_device *dev,
Expand Down Expand Up @@ -3676,7 +3676,7 @@ static int dio_60xx_wbits(struct comedi_device *dev, struct comedi_subdevice *s,

data[1] = readb(priv(dev)->dio_counter_iobase + DIO_DATA_60XX_REG);

return 2;
return insn->n;
}

static void caldac_write(struct comedi_device *dev, unsigned int channel,
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/comedi/drivers/comedi_parport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static int parport_insn_a(struct comedi_device *dev, struct comedi_subdevice *s,

data[1] = inb(dev->iobase + PARPORT_A);

return 2;
return insn->n;
}

static int parport_insn_config_a(struct comedi_device *dev,
Expand Down Expand Up @@ -139,7 +139,7 @@ static int parport_insn_b(struct comedi_device *dev, struct comedi_subdevice *s,

data[1] = (inb(dev->iobase + PARPORT_B) >> 3);

return 2;
return insn->n;
}

static int parport_insn_c(struct comedi_device *dev, struct comedi_subdevice *s,
Expand All @@ -155,15 +155,15 @@ static int parport_insn_c(struct comedi_device *dev, struct comedi_subdevice *s,

data[1] = devpriv->c_data & 0xf;

return 2;
return insn->n;
}

static int parport_intr_insn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
data[1] = 0;
return 2;
return insn->n;
}

static int parport_intr_cmdtest(struct comedi_device *dev,
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/contec_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static int contec_do_insn_bits(struct comedi_device *dev,
dev->iobase + thisboard->out_offs);
outw(s->state, dev->iobase + thisboard->out_offs);
}
return 2;
return insn->n;
}

static int contec_di_insn_bits(struct comedi_device *dev,
Expand All @@ -94,7 +94,7 @@ static int contec_di_insn_bits(struct comedi_device *dev,

data[1] = inw(dev->iobase + thisboard->in_offs);

return 2;
return insn->n;
}

static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/comedi/drivers/das08.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ static int das08_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
data[0] = 0;
data[1] = DAS08_IP(inb(dev->iobase + DAS08_STATUS));

return 2;
return insn->n;
}

static int das08_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
Expand All @@ -338,7 +338,7 @@ static int das08_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,

data[1] = wbits;

return 2;
return insn->n;
}

static int __maybe_unused
Expand All @@ -348,7 +348,7 @@ das08jr_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
data[0] = 0;
data[1] = inb(dev->iobase + DAS08JR_DIO);

return 2;
return insn->n;
}

static int __maybe_unused
Expand All @@ -365,7 +365,7 @@ das08jr_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,

data[1] = devpriv->do_bits;

return 2;
return insn->n;
}

static int __maybe_unused
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/das16.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ static int das16_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
data[1] = bits;
data[0] = 0;

return 2;
return insn->n;
}

static int das16_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
Expand All @@ -832,7 +832,7 @@ static int das16_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,

outb(s->state, dev->iobase + DAS16_DIO);

return 2;
return insn->n;
}

static int das16_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
Expand Down
Loading

0 comments on commit a2714e3

Please sign in to comment.