Commit 0bbf3ea6 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: pcl818: prefer using the BIT macro

Fix the checkpatch.pl issues.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4976034f
...@@ -124,23 +124,22 @@ ...@@ -124,23 +124,22 @@
#define PCL818_AO_MSB_REG(x) (0x05 + ((x) * 2)) #define PCL818_AO_MSB_REG(x) (0x05 + ((x) * 2))
#define PCL818_STATUS_REG 0x08 #define PCL818_STATUS_REG 0x08
#define PCL818_STATUS_NEXT_CHAN_MASK (0xf << 0) #define PCL818_STATUS_NEXT_CHAN_MASK (0xf << 0)
#define PCL818_STATUS_INT (1 << 4) #define PCL818_STATUS_INT BIT(4)
#define PCL818_STATUS_MUX (1 << 5) #define PCL818_STATUS_MUX BIT(5)
#define PCL818_STATUS_UNI (1 << 6) #define PCL818_STATUS_UNI BIT(6)
#define PCL818_STATUS_EOC (1 << 7) #define PCL818_STATUS_EOC BIT(7)
#define PCL818_CTRL_REG 0x09 #define PCL818_CTRL_REG 0x09
#define PCL818_CTRL_DISABLE_TRIG (0 << 0) #define PCL818_CTRL_TRIG(x) (((x) & 0x3) << 0)
#define PCL818_CTRL_SOFT_TRIG (1 << 0) #define PCL818_CTRL_DISABLE_TRIG PCL818_CTRL_TRIG(0)
#define PCL818_CTRL_EXT_TRIG (2 << 0) #define PCL818_CTRL_SOFT_TRIG PCL818_CTRL_TRIG(1)
#define PCL818_CTRL_PACER_TRIG (3 << 0) #define PCL818_CTRL_EXT_TRIG PCL818_CTRL_TRIG(2)
#define PCL818_CTRL_DMAE (1 << 2) #define PCL818_CTRL_PACER_TRIG PCL818_CTRL_TRIG(3)
#define PCL818_CTRL_DMAE BIT(2)
#define PCL818_CTRL_IRQ(x) ((x) << 4) #define PCL818_CTRL_IRQ(x) ((x) << 4)
#define PCL818_CTRL_INTE (1 << 7) #define PCL818_CTRL_INTE BIT(7)
#define PCL818_CNTENABLE_REG 0x0a #define PCL818_CNTENABLE_REG 0x0a
#define PCL818_CNTENABLE_PACER_ENA (0 << 0) #define PCL818_CNTENABLE_PACER_TRIG0 BIT(0)
#define PCL818_CNTENABLE_PACER_TRIG0 (1 << 0) #define PCL818_CNTENABLE_CNT0_INT_CLK BIT(1) /* 0=ext clk */
#define PCL818_CNTENABLE_CNT0_EXT_CLK (0 << 1)
#define PCL818_CNTENABLE_CNT0_INT_CLK (1 << 1)
#define PCL818_DO_DI_MSB_REG 0x0b #define PCL818_DO_DI_MSB_REG 0x0b
#define PCL818_TIMER_BASE 0x0c #define PCL818_TIMER_BASE 0x0c
...@@ -740,7 +739,7 @@ static int pcl818_ai_cmd(struct comedi_device *dev, ...@@ -740,7 +739,7 @@ static int pcl818_ai_cmd(struct comedi_device *dev,
else else
ctrl |= PCL818_CTRL_EXT_TRIG; ctrl |= PCL818_CTRL_EXT_TRIG;
outb(PCL818_CNTENABLE_PACER_ENA, dev->iobase + PCL818_CNTENABLE_REG); outb(0, dev->iobase + PCL818_CNTENABLE_REG);
if (dma) { if (dma) {
/* setup and enable dma for the first buffer */ /* setup and enable dma for the first buffer */
...@@ -902,7 +901,7 @@ static void pcl818_reset(struct comedi_device *dev) ...@@ -902,7 +901,7 @@ static void pcl818_reset(struct comedi_device *dev)
pcl818_ai_set_chan_range(dev, 0, 0); pcl818_ai_set_chan_range(dev, 0, 0);
/* stop pacer */ /* stop pacer */
outb(PCL818_CNTENABLE_PACER_ENA, dev->iobase + PCL818_CNTENABLE_REG); outb(0, dev->iobase + PCL818_CNTENABLE_REG);
/* set analog output channels to 0V */ /* set analog output channels to 0V */
for (chan = 0; chan < board->n_aochan; chan++) { for (chan = 0; chan < board->n_aochan; chan++) {
......
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