From 9dc99895ef2bd96bad9674e4a0a6228c0690c912 Mon Sep 17 00:00:00 2001 From: "J. Ali Harlow" Date: Wed, 18 May 2011 19:18:53 +0100 Subject: [PATCH] comedi vmk80xx: simplify rinsn output calculation vmk80xx_di_rinsn() and vmk80xx_do_rinsn() extract the required channel data by inconsistent and overly-complex algorithms. Simplify them both. Signed-off-by: J. Ali Harlow Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/vmk80xx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c index 01cfb7695f7c..c86c8664101b 100644 --- a/drivers/staging/comedi/drivers/vmk80xx.c +++ b/drivers/staging/comedi/drivers/vmk80xx.c @@ -747,7 +747,7 @@ static int vmk80xx_di_rinsn(struct comedi_device *cdev, else inp = rx_buf[reg]; - data[n] = ((inp & (1 << chan)) > 0); + data[n] = (inp >> chan) & 1; } up(&dev->limit_sem); @@ -812,7 +812,6 @@ static int vmk80xx_do_rinsn(struct comedi_device *cdev, struct vmk80xx_usb *dev = cdev->private; int chan; int reg; - int mask; int n; dbgvm("vmk80xx: %s\n", __func__); @@ -825,7 +824,6 @@ static int vmk80xx_do_rinsn(struct comedi_device *cdev, chan = CR_CHAN(insn->chanspec); reg = VMK8061_DO_REG; - mask = 1 << chan; dev->usb_tx_buf[0] = VMK8061_CMD_RD_DO; @@ -833,7 +831,7 @@ static int vmk80xx_do_rinsn(struct comedi_device *cdev, if (vmk80xx_read_packet(dev)) break; - data[n] = (dev->usb_rx_buf[reg] & mask) >> chan; + data[n] = (dev->usb_rx_buf[reg] >> chan) & 1; } up(&dev->limit_sem);