Commit 12f992ad authored by Anson Jacob's avatar Anson Jacob Committed by Greg Kroah-Hartman

staging: comedi: cb_pcidas64: Fix commenting style

Remove additional space after /*
Convert single line block comment into single line comment
Signed-off-by: default avatarAnson Jacob <ansonjacob.aj@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28fec2e6
...@@ -216,7 +216,8 @@ enum hw_config_contents { ...@@ -216,7 +216,8 @@ enum hw_config_contents {
EXT_QUEUE_BIT = 0x200, /* use external channel/gain queue */ EXT_QUEUE_BIT = 0x200, /* use external channel/gain queue */
/* use 225 nanosec strobe when loading dac instead of 50 nanosec */ /* use 225 nanosec strobe when loading dac instead of 50 nanosec */
SLOW_DAC_BIT = 0x400, SLOW_DAC_BIT = 0x400,
/* bit with unknown function yet given as default value in pci-das64 /*
* bit with unknown function yet given as default value in pci-das64
* manual * manual
*/ */
HW_CONFIG_DUMMY_BITS = 0x2000, HW_CONFIG_DUMMY_BITS = 0x2000,
...@@ -1007,9 +1008,7 @@ static const struct pcidas64_board pcidas64_boards[] = { ...@@ -1007,9 +1008,7 @@ static const struct pcidas64_board pcidas64_boards[] = {
.has_8255 = 1, .has_8255 = 1,
}, },
#if 0 #if 0
/* /* The device id for these boards is unknown */
* The device id for these boards is unknown
*/
[BOARD_PCIDAS6402_16_JR] = { [BOARD_PCIDAS6402_16_JR] = {
.name = "pci-das6402/16/jr", .name = "pci-das6402/16/jr",
...@@ -1139,13 +1138,15 @@ struct pcidas64_private { ...@@ -1139,13 +1138,15 @@ struct pcidas64_private {
uint16_t *ai_buffer[MAX_AI_DMA_RING_COUNT]; uint16_t *ai_buffer[MAX_AI_DMA_RING_COUNT];
/* physical addresses of ai dma buffers */ /* physical addresses of ai dma buffers */
dma_addr_t ai_buffer_bus_addr[MAX_AI_DMA_RING_COUNT]; dma_addr_t ai_buffer_bus_addr[MAX_AI_DMA_RING_COUNT];
/* array of ai dma descriptors read by plx9080, /*
* array of ai dma descriptors read by plx9080,
* allocated to get proper alignment * allocated to get proper alignment
*/ */
struct plx_dma_desc *ai_dma_desc; struct plx_dma_desc *ai_dma_desc;
/* physical address of ai dma descriptor array */ /* physical address of ai dma descriptor array */
dma_addr_t ai_dma_desc_bus_addr; dma_addr_t ai_dma_desc_bus_addr;
/* index of the ai dma descriptor/buffer /*
* index of the ai dma descriptor/buffer
* that is currently being used * that is currently being used
*/ */
unsigned int ai_dma_index; unsigned int ai_dma_index;
...@@ -1317,11 +1318,13 @@ static void init_plx9080(struct comedi_device *dev) ...@@ -1317,11 +1318,13 @@ static void init_plx9080(struct comedi_device *dev)
bits |= PLX_DMAMODE_BTERMIEN; bits |= PLX_DMAMODE_BTERMIEN;
/* enable dma chaining */ /* enable dma chaining */
bits |= PLX_DMAMODE_CHAINEN; bits |= PLX_DMAMODE_CHAINEN;
/* enable interrupt on dma done /*
* enable interrupt on dma done
* (probably don't need this, since chain never finishes) * (probably don't need this, since chain never finishes)
*/ */
bits |= PLX_DMAMODE_DONEIEN; bits |= PLX_DMAMODE_DONEIEN;
/* don't increment local address during transfers /*
* don't increment local address during transfers
* (we are transferring from a fixed fifo register) * (we are transferring from a fixed fifo register)
*/ */
bits |= PLX_DMAMODE_LACONST; bits |= PLX_DMAMODE_LACONST;
...@@ -1624,13 +1627,11 @@ static void i2c_set_sda(struct comedi_device *dev, int state) ...@@ -1624,13 +1627,11 @@ static void i2c_set_sda(struct comedi_device *dev, int state)
void __iomem *plx_control_addr = devpriv->plx9080_iobase + void __iomem *plx_control_addr = devpriv->plx9080_iobase +
PLX_REG_CNTRL; PLX_REG_CNTRL;
if (state) { if (state) { /* set data line high */
/* set data line high */
devpriv->plx_control_bits &= ~data_bit; devpriv->plx_control_bits &= ~data_bit;
writel(devpriv->plx_control_bits, plx_control_addr); writel(devpriv->plx_control_bits, plx_control_addr);
udelay(i2c_high_udelay); udelay(i2c_high_udelay);
} else { /* set data line low */ } else { /* set data line low */
devpriv->plx_control_bits |= data_bit; devpriv->plx_control_bits |= data_bit;
writel(devpriv->plx_control_bits, plx_control_addr); writel(devpriv->plx_control_bits, plx_control_addr);
udelay(i2c_low_udelay); udelay(i2c_low_udelay);
...@@ -1645,13 +1646,11 @@ static void i2c_set_scl(struct comedi_device *dev, int state) ...@@ -1645,13 +1646,11 @@ static void i2c_set_scl(struct comedi_device *dev, int state)
void __iomem *plx_control_addr = devpriv->plx9080_iobase + void __iomem *plx_control_addr = devpriv->plx9080_iobase +
PLX_REG_CNTRL; PLX_REG_CNTRL;
if (state) { if (state) { /* set clock line high */
/* set clock line high */
devpriv->plx_control_bits &= ~clock_bit; devpriv->plx_control_bits &= ~clock_bit;
writel(devpriv->plx_control_bits, plx_control_addr); writel(devpriv->plx_control_bits, plx_control_addr);
udelay(i2c_high_udelay); udelay(i2c_high_udelay);
} else { /* set clock line low */ } else { /* set clock line low */
devpriv->plx_control_bits |= clock_bit; devpriv->plx_control_bits |= clock_bit;
writel(devpriv->plx_control_bits, plx_control_addr); writel(devpriv->plx_control_bits, plx_control_addr);
udelay(i2c_low_udelay); udelay(i2c_low_udelay);
...@@ -3781,9 +3780,7 @@ static int eeprom_read_insn(struct comedi_device *dev, ...@@ -3781,9 +3780,7 @@ static int eeprom_read_insn(struct comedi_device *dev,
return 1; return 1;
} }
/* /* Allocate and initialize the subdevice structures. */
* Allocate and initialize the subdevice structures.
*/
static int setup_subdevices(struct comedi_device *dev) static int setup_subdevices(struct comedi_device *dev)
{ {
const struct pcidas64_board *board = dev->board_ptr; const struct pcidas64_board *board = dev->board_ptr;
......
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