Skip to content

Commit

Permalink
staging: comedi: me4000: 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 bce2706 commit 8aaf271
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/comedi/drivers/me4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 8aaf271

Please sign in to comment.