From: H Hartley Sweeten Date: Wed, 5 Jun 2013 22:36:45 +0000 (-0700) Subject: staging: comedi: pcmad: remove need for boardinfo in pcmad_ai_insn_read() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a0e82af4c5703138b21e417440ffc937b671db1e;p=linux-beck.git staging: comedi: pcmad: remove need for boardinfo in pcmad_ai_insn_read() The const boardinfo pointer is only used in this function to work out the value needed to convert the data to its twos complement. Use the comedi_subdevice 'maxdata' to do this conversion and remove the 'board' pointer. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c index f64e75b871a7..a05b5d488f7d 100644 --- a/drivers/staging/comedi/drivers/pcmad.c +++ b/drivers/staging/comedi/drivers/pcmad.c @@ -88,7 +88,6 @@ static int pcmad_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - const struct pcmad_board_struct *board = comedi_board(dev); struct pcmad_priv_struct *devpriv = dev->private; int chan; int n; @@ -107,7 +106,7 @@ static int pcmad_ai_insn_read(struct comedi_device *dev, data[n] |= (inb(dev->iobase + PCMAD_MSB) << 8); if (devpriv->twos_comp) - data[n] ^= (1 << (board->n_ai_bits - 1)); + data[n] ^= ((s->maxdata + 1) >> 1); } return n;