diff options
author | Sanjana Sanikommu <sanjana99reddy99@gmail.com> | 2019-03-31 16:17:30 +0530 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 19:31:11 +0200 |
commit | 557e36194ed4052a8767e356784027b545c8a311 (patch) | |
tree | d5d82d7250420ade367ffd19a55acc8b66168393 /drivers/staging/comedi | |
parent | 9a3aebc02a8469decafd0aae557082ff15259b85 (diff) | |
download | linux-557e36194ed4052a8767e356784027b545c8a311.tar.gz linux-557e36194ed4052a8767e356784027b545c8a311.tar.bz2 linux-557e36194ed4052a8767e356784027b545c8a311.zip |
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: Sanjana Sanikommu <sanjana99reddy99@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/drivers/amplc_pci230.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/das08.c | 4 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/dyna_pci10xx.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_at_ao.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index 08ffe26c5d43..65f60c2b702a 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -2464,7 +2464,7 @@ static int pci230_auto_attach(struct comedi_device *dev, devpriv->adcg = 0; devpriv->adccon = PCI230_ADC_TRIG_NONE | PCI230_ADC_IM_SE | 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->adccon | PCI230_ADC_FIFO_RESET, devpriv->daqio + PCI230_ADCCON); diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index 327ecf9aea30..65e5f2e6c122 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -236,9 +236,9 @@ static int das08_ai_insn_read(struct comedi_device *dev, * COMEDI 16-bit bipolar data value for 0V is 0x8000. */ if (msb & 0x80) - data[n] = (1 << 15) + magnitude; + data[n] = BIT(15) + magnitude; else - data[n] = (1 << 15) - magnitude; + data[n] = BIT(15) - magnitude; } else { dev_err(dev->class_dev, "bug! unknown ai encoding\n"); return -1; diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c index e50536731d11..9bdd5bf2eb99 100644 --- a/drivers/staging/comedi/drivers/dyna_pci10xx.c +++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c @@ -54,7 +54,7 @@ static int dyna_pci10xx_ai_eoc(struct comedi_device *dev, unsigned int status; status = inw_p(dev->iobase); - if (status & (1 << 15)) + if (status & BIT(15)) return 0; return -EBUSY; } diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c index aad0b295ee2b..814895d01ffa 100644 --- a/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/drivers/staging/comedi/drivers/ni_at_ao.c @@ -244,7 +244,7 @@ static int atao_calib_insn_write(struct comedi_device *dev, /* write the channel and last data value to the caldac */ /* 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; outw(bits, dev->iobase + ATAO_CFG2_REG); diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index b9e525b9beb9..81fd4c26a16f 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -239,7 +239,7 @@ static int daq700_auto_attach(struct comedi_device *dev, s->type = COMEDI_SUBD_AI; s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF; s->n_chan = 16; - s->maxdata = (1 << 12) - 1; + s->maxdata = BIT(12) - 1; s->range_table = &range_daq700_ai; s->insn_read = daq700_ai_rinsn; daq700_ai_config(dev, s); diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index a9616f136c61..248950cf6d41 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -4800,7 +4800,7 @@ static int cs5529_do_conversion(struct comedi_device *dev, if (data) { *data = ni_ao_win_inw(dev, NI67XX_CAL_DATA_REG); /* cs5529 returns 16 bit signed data in bipolar mode */ - *data ^= (1 << 15); + *data ^= BIT(15); } return 0; } @@ -6209,7 +6209,7 @@ static int ni_E_init(struct comedi_device *dev, s->subdev_flags = SDF_READABLE | SDF_DIFF | SDF_INTERNAL; /* one channel for each analog output channel */ s->n_chan = board->n_aochan; - s->maxdata = (1 << 16) - 1; + s->maxdata = BIT(16) - 1; s->range_table = &range_unknown; /* XXX */ s->insn_read = cs5529_ai_insn_read; s->insn_config = NULL; |