Skip to content

Commit

Permalink
staging: comedi: kcomedilib: remove subdevice pointer math
Browse files Browse the repository at this point in the history
Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent d3d1e25 commit 5818e70
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/staging/comedi/kcomedilib/kcomedilib_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static int comedi_do_insn(struct comedi_device *dev, struct comedi_insn *insn)
ret = -EINVAL;
goto error;
}
s = dev->subdevices + insn->subdev;
s = &dev->subdevices[insn->subdev];

if (s->type == COMEDI_SUBD_UNUSED) {
printk(KERN_ERR "%d not useable subdevice\n", insn->subdev);
Expand Down Expand Up @@ -175,11 +175,14 @@ EXPORT_SYMBOL(comedi_dio_bitfield);
int comedi_find_subdevice_by_type(struct comedi_device *dev, int type,
unsigned int subd)
{
struct comedi_subdevice *s;

if (subd > dev->n_subdevices)
return -ENODEV;

for (; subd < dev->n_subdevices; subd++) {
if (dev->subdevices[subd].type == type)
s = &dev->subdevices[subd];
if (s->type == type)
return subd;
}
return -1;
Expand All @@ -188,7 +191,7 @@ EXPORT_SYMBOL(comedi_find_subdevice_by_type);

int comedi_get_n_channels(struct comedi_device *dev, unsigned int subdevice)
{
struct comedi_subdevice *s = dev->subdevices + subdevice;
struct comedi_subdevice *s = &dev->subdevices[subdevice];

return s->n_chan;
}
Expand Down

0 comments on commit 5818e70

Please sign in to comment.