Commit 557e3619 authored by Sanjana Sanikommu's avatar Sanjana Sanikommu Committed by Greg Kroah-Hartman

staging: comedi: Prefer using BIT macro in various files.

Challenge suggested by coccinelle.

Replace bit shifting on 1 with the BIT(x) macro.
Coccinelle script:

@@
constant c;
@@

-(1 << c)
+BIT(c)
Signed-off-by: default avatarSanjana Sanikommu <sanjana99reddy99@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9a3aebc0
...@@ -2464,7 +2464,7 @@ static int pci230_auto_attach(struct comedi_device *dev, ...@@ -2464,7 +2464,7 @@ static int pci230_auto_attach(struct comedi_device *dev,
devpriv->adcg = 0; devpriv->adcg = 0;
devpriv->adccon = PCI230_ADC_TRIG_NONE | PCI230_ADC_IM_SE | devpriv->adccon = PCI230_ADC_TRIG_NONE | PCI230_ADC_IM_SE |
PCI230_ADC_IR_BIP; PCI230_ADC_IR_BIP;
outw(1 << 0, devpriv->daqio + PCI230_ADCEN); outw(BIT(0), devpriv->daqio + PCI230_ADCEN);
outw(devpriv->adcg, devpriv->daqio + PCI230_ADCG); outw(devpriv->adcg, devpriv->daqio + PCI230_ADCG);
outw(devpriv->adccon | PCI230_ADC_FIFO_RESET, outw(devpriv->adccon | PCI230_ADC_FIFO_RESET,
devpriv->daqio + PCI230_ADCCON); devpriv->daqio + PCI230_ADCCON);
......
...@@ -236,9 +236,9 @@ static int das08_ai_insn_read(struct comedi_device *dev, ...@@ -236,9 +236,9 @@ static int das08_ai_insn_read(struct comedi_device *dev,
* COMEDI 16-bit bipolar data value for 0V is 0x8000. * COMEDI 16-bit bipolar data value for 0V is 0x8000.
*/ */
if (msb & 0x80) if (msb & 0x80)
data[n] = (1 << 15) + magnitude; data[n] = BIT(15) + magnitude;
else else
data[n] = (1 << 15) - magnitude; data[n] = BIT(15) - magnitude;
} else { } else {
dev_err(dev->class_dev, "bug! unknown ai encoding\n"); dev_err(dev->class_dev, "bug! unknown ai encoding\n");
return -1; return -1;
......
...@@ -54,7 +54,7 @@ static int dyna_pci10xx_ai_eoc(struct comedi_device *dev, ...@@ -54,7 +54,7 @@ static int dyna_pci10xx_ai_eoc(struct comedi_device *dev,
unsigned int status; unsigned int status;
status = inw_p(dev->iobase); status = inw_p(dev->iobase);
if (status & (1 << 15)) if (status & BIT(15))
return 0; return 0;
return -EBUSY; return -EBUSY;
} }
......
...@@ -244,7 +244,7 @@ static int atao_calib_insn_write(struct comedi_device *dev, ...@@ -244,7 +244,7 @@ static int atao_calib_insn_write(struct comedi_device *dev,
/* write the channel and last data value to the caldac */ /* write the channel and last data value to the caldac */
/* clock the bitstring to the caldac; MSB -> LSB */ /* clock the bitstring to the caldac; MSB -> LSB */
for (bit = 1 << 10; bit; bit >>= 1) { for (bit = BIT(10); bit; bit >>= 1) {
bits = (bit & bitstring) ? ATAO_CFG2_SDATA : 0; bits = (bit & bitstring) ? ATAO_CFG2_SDATA : 0;
outw(bits, dev->iobase + ATAO_CFG2_REG); outw(bits, dev->iobase + ATAO_CFG2_REG);
......
...@@ -239,7 +239,7 @@ static int daq700_auto_attach(struct comedi_device *dev, ...@@ -239,7 +239,7 @@ static int daq700_auto_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF; s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF;
s->n_chan = 16; s->n_chan = 16;
s->maxdata = (1 << 12) - 1; s->maxdata = BIT(12) - 1;
s->range_table = &range_daq700_ai; s->range_table = &range_daq700_ai;
s->insn_read = daq700_ai_rinsn; s->insn_read = daq700_ai_rinsn;
daq700_ai_config(dev, s); daq700_ai_config(dev, s);
......
...@@ -4800,7 +4800,7 @@ static int cs5529_do_conversion(struct comedi_device *dev, ...@@ -4800,7 +4800,7 @@ static int cs5529_do_conversion(struct comedi_device *dev,
if (data) { if (data) {
*data = ni_ao_win_inw(dev, NI67XX_CAL_DATA_REG); *data = ni_ao_win_inw(dev, NI67XX_CAL_DATA_REG);
/* cs5529 returns 16 bit signed data in bipolar mode */ /* cs5529 returns 16 bit signed data in bipolar mode */
*data ^= (1 << 15); *data ^= BIT(15);
} }
return 0; return 0;
} }
...@@ -6209,7 +6209,7 @@ static int ni_E_init(struct comedi_device *dev, ...@@ -6209,7 +6209,7 @@ static int ni_E_init(struct comedi_device *dev,
s->subdev_flags = SDF_READABLE | SDF_DIFF | SDF_INTERNAL; s->subdev_flags = SDF_READABLE | SDF_DIFF | SDF_INTERNAL;
/* one channel for each analog output channel */ /* one channel for each analog output channel */
s->n_chan = board->n_aochan; s->n_chan = board->n_aochan;
s->maxdata = (1 << 16) - 1; s->maxdata = BIT(16) - 1;
s->range_table = &range_unknown; /* XXX */ s->range_table = &range_unknown; /* XXX */
s->insn_read = cs5529_ai_insn_read; s->insn_read = cs5529_ai_insn_read;
s->insn_config = NULL; s->insn_config = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment