Commit 4281c748 authored by Anson Jacob's avatar Anson Jacob Committed by Greg Kroah-Hartman

staging: comedi: ni_at_a2150: Fix checkpatch warning

Fix checkpatch.pl warning 'line over 80 characters'
Remove extra space after /*
Signed-off-by: default avatarAnson Jacob <ansonjacob.aj@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d5e59c96
...@@ -63,8 +63,10 @@ ...@@ -63,8 +63,10 @@
#define CLOCK_SELECT_BITS(x) (((x) & 0x3) << 3) #define CLOCK_SELECT_BITS(x) (((x) & 0x3) << 3)
#define CLOCK_DIVISOR_BITS(x) (((x) & 0x3) << 5) #define CLOCK_DIVISOR_BITS(x) (((x) & 0x3) << 5)
#define CLOCK_MASK (0xf << 3) #define CLOCK_MASK (0xf << 3)
#define ENABLE0_BIT 0x80 /* enable (don't internally ground) channels 0 and 1 */ /* enable (don't internally ground) channels 0 and 1 */
#define ENABLE1_BIT 0x100 /* enable (don't internally ground) channels 2 and 3 */ #define ENABLE0_BIT 0x80
/* enable (don't internally ground) channels 2 and 3 */
#define ENABLE1_BIT 0x100
#define AC0_BIT 0x200 /* ac couple channels 0,1 */ #define AC0_BIT 0x200 /* ac couple channels 0,1 */
#define AC1_BIT 0x400 /* ac couple channels 2,3 */ #define AC1_BIT 0x400 /* ac couple channels 2,3 */
#define APD_BIT 0x800 /* analog power down */ #define APD_BIT 0x800 /* analog power down */
...@@ -83,7 +85,8 @@ ...@@ -83,7 +85,8 @@
#define EDAQ_BIT 0x10 /* end of acquisition interrupt */ #define EDAQ_BIT 0x10 /* end of acquisition interrupt */
#define DCAL_BIT 0x20 /* offset calibration in progress */ #define DCAL_BIT 0x20 /* offset calibration in progress */
#define INTR_BIT 0x40 /* interrupt has occurred */ #define INTR_BIT 0x40 /* interrupt has occurred */
#define DMA_TC_BIT 0x80 /* dma terminal count interrupt has occurred */ /* dma terminal count interrupt has occurred */
#define DMA_TC_BIT 0x80
#define ID_BITS(x) (((x) >> 8) & 0x3) #define ID_BITS(x) (((x) >> 8) & 0x3)
#define IRQ_DMA_CNTRL_REG 0x12 /* write only */ #define IRQ_DMA_CNTRL_REG 0x12 /* write only */
#define DMA_CHAN_BITS(x) ((x) & 0x7) /* sets dma channel */ #define DMA_CHAN_BITS(x) ((x) & 0x7) /* sets dma channel */
...@@ -91,7 +94,8 @@ ...@@ -91,7 +94,8 @@
#define IRQ_LVL_BITS(x) (((x) & 0xf) << 4) /* sets irq level */ #define IRQ_LVL_BITS(x) (((x) & 0xf) << 4) /* sets irq level */
#define FIFO_INTR_EN_BIT 0x100 /* enable fifo interrupts */ #define FIFO_INTR_EN_BIT 0x100 /* enable fifo interrupts */
#define FIFO_INTR_FHF_BIT 0x200 /* interrupt fifo half full */ #define FIFO_INTR_FHF_BIT 0x200 /* interrupt fifo half full */
#define DMA_INTR_EN_BIT 0x800 /* enable interrupt on dma terminal count */ /* enable interrupt on dma terminal count */
#define DMA_INTR_EN_BIT 0x800
#define DMA_DEM_EN_BIT 0x1000 /* enables demand mode dma */ #define DMA_DEM_EN_BIT 0x1000 /* enables demand mode dma */
#define I8253_BASE_REG 0x14 #define I8253_BASE_REG 0x14
...@@ -189,7 +193,8 @@ static irqreturn_t a2150_interrupt(int irq, void *d) ...@@ -189,7 +193,8 @@ static irqreturn_t a2150_interrupt(int irq, void *d)
if (leftover > max_points) if (leftover > max_points)
leftover = max_points; leftover = max_points;
} }
/* there should only be a residue if collection was stopped by having /*
* There should only be a residue if collection was stopped by having
* the stop_src set to an external trigger, in which case there * the stop_src set to an external trigger, in which case there
* will be no more data * will be no more data
*/ */
...@@ -550,7 +555,10 @@ static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -550,7 +555,10 @@ static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
if (cmd->start_src == TRIG_EXT) { if (cmd->start_src == TRIG_EXT) {
trigger_bits |= HW_TRIG_EN; trigger_bits |= HW_TRIG_EN;
} else if (cmd->start_src == TRIG_OTHER) { } else if (cmd->start_src == TRIG_OTHER) {
/* XXX add support for level/slope start trigger using TRIG_OTHER */ /*
* XXX add support for level/slope start trigger
* using TRIG_OTHER
*/
dev_err(dev->class_dev, "you shouldn't see this?\n"); dev_err(dev->class_dev, "you shouldn't see this?\n");
} }
/* send trigger config bits */ /* send trigger config bits */
......
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