From: H Hartley Sweeten Date: Tue, 11 Sep 2012 02:00:46 +0000 (-0700) Subject: staging: comedi: adl_pci9111: use local variables for the chan/range X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ae479ee562cf3d7d33eebbb30e6c3105475ed5b8;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git staging: comedi: adl_pci9111: use local variables for the chan/range Simplify the chan/range in pci9111_ai_insn_read() by using local variables for hold the values and by just passing insn->chanspec to the CR_* macros instead of using (&insn->chanspec)[0]. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index 6d20e59c6964..0103e44acd45 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -855,16 +855,18 @@ static int pci9111_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { + unsigned int chan = CR_CHAN(insn->chanspec); + unsigned int range = CR_RANGE(insn->chanspec); unsigned int maxdata = s->maxdata; unsigned int invert = (maxdata + 1) >> 1; unsigned int shift = (maxdata == 0xffff) ? 0 : 4; int timeout; int i; - pci9111_ai_channel_set(CR_CHAN((&insn->chanspec)[0])); + pci9111_ai_channel_set(chan); - if ((pci9111_ai_range_get()) != CR_RANGE((&insn->chanspec)[0])) - pci9111_ai_range_set(CR_RANGE((&insn->chanspec)[0])); + if ((pci9111_ai_range_get()) != range) + pci9111_ai_range_set(range); pci9111_fifo_reset();