[PATCH] Staging:comedi:cb_pcidas64=>Fixed checkpatch warnings

2016-12-18 Thread Devendra Sharma
From: devendra sharma 

Signed-off-by Devendra Sharma 
---
 drivers/staging/comedi/drivers/cb_pcidas64.c | 20 
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c 
b/drivers/staging/comedi/drivers/cb_pcidas64.c
index cb9c269..946c580 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1500,10 +1500,9 @@ static int alloc_and_init_dma_members(struct 
comedi_device *dev)
if (ao_cmd_is_supported(board)) {
devpriv->ao_buffer[i] =
dma_alloc_coherent(&pcidev->dev,
-  DMA_BUFFER_SIZE,
-  &devpriv->
-  ao_buffer_bus_addr[i],
-  GFP_KERNEL);
+  DMA_BUFFER_SIZE,
+  &devpriv->ao_buffer_bus_addr[i],
+  GFP_KERNEL);
if (!devpriv->ao_buffer[i])
return -ENOMEM;
}
@@ -2476,18 +2475,15 @@ static int setup_channel_queue(struct comedi_device 
*dev,
for (i = 0; i < cmd->chanlist_len; i++) {
bits = 0;
/* set channel */
-   bits |= adc_chan_bits(CR_CHAN(cmd->
- chanlist[i]));
+   bits |= adc_chan_bits(
+   CR_CHAN(cmd->chanlist[i]));
/* set gain */
bits |= ai_range_bits_6xxx(dev,
-  CR_RANGE(cmd->
-   chanlist
-   [i]));
+  CR_RANGE(cmd->chanlist[i]));
/* set single-ended / differential */
bits |= se_diff_bit_6xxx(dev,
-CR_AREF(cmd->
-chanlist[i]) ==
-AREF_DIFF);
+CR_AREF(cmd->chanlist[i]) ==
+AREF_DIFF);
if (CR_AREF(cmd->chanlist[i]) == AREF_COMMON)
bits |= ADC_COMMON_BIT;
/* mark end of queue */
-- 
2.7.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] Staging:comedi:cb_pcidas64=>Fixed check patch warnings

2016-12-18 Thread devendra sharma
Fixed check patch warnings about multiple line dereferencing

Signed-off-by: Devendra Sharma 
---
 drivers/staging/comedi/drivers/cb_pcidas64.c | 20 
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c 
b/drivers/staging/comedi/drivers/cb_pcidas64.c
index cb9c269..946c580 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1500,10 +1500,9 @@ static int alloc_and_init_dma_members(struct 
comedi_device *dev)
if (ao_cmd_is_supported(board)) {
devpriv->ao_buffer[i] =
dma_alloc_coherent(&pcidev->dev,
-  DMA_BUFFER_SIZE,
-  &devpriv->
-  ao_buffer_bus_addr[i],
-  GFP_KERNEL);
+  DMA_BUFFER_SIZE,
+  &devpriv->ao_buffer_bus_addr[i],
+  GFP_KERNEL);
if (!devpriv->ao_buffer[i])
return -ENOMEM;
}
@@ -2476,18 +2475,15 @@ static int setup_channel_queue(struct comedi_device 
*dev,
for (i = 0; i < cmd->chanlist_len; i++) {
bits = 0;
/* set channel */
-   bits |= adc_chan_bits(CR_CHAN(cmd->
- chanlist[i]));
+   bits |= adc_chan_bits(
+   CR_CHAN(cmd->chanlist[i]));
/* set gain */
bits |= ai_range_bits_6xxx(dev,
-  CR_RANGE(cmd->
-   chanlist
-   [i]));
+  CR_RANGE(cmd->chanlist[i]));
/* set single-ended / differential */
bits |= se_diff_bit_6xxx(dev,
-CR_AREF(cmd->
-chanlist[i]) ==
-AREF_DIFF);
+CR_AREF(cmd->chanlist[i]) ==
+AREF_DIFF);
if (CR_AREF(cmd->chanlist[i]) == AREF_COMMON)
bits |= ADC_COMMON_BIT;
/* mark end of queue */
-- 
2.7.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: comedi: dyna_pci10xx: fixed check patch warnings about memory barrier comments

2016-12-19 Thread devendra sharma
Added comments before memory barrier

Signed-off-by: Devendra Sharma 
---
 drivers/staging/comedi/drivers/dyna_pci10xx.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c 
b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index c9eb26f..c3b5236 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -122,6 +122,7 @@ static int dyna_pci10xx_insn_write_ao(struct comedi_device 
*dev,
 
mutex_lock(&devpriv->mutex);
for (n = 0; n < insn->n; n++) {
+   /*multi-processor memory barrier*/
smp_mb();
/* trigger conversion and write data */
outw_p(data[n], dev->iobase);
@@ -141,6 +142,7 @@ static int dyna_pci10xx_di_insn_bits(struct comedi_device 
*dev,
u16 d = 0;
 
mutex_lock(&devpriv->mutex);
+   /*multi-processor memory barrier*/
smp_mb();
d = inw_p(devpriv->BADR3);
udelay(10);
@@ -161,6 +163,7 @@ static int dyna_pci10xx_do_insn_bits(struct comedi_device 
*dev,
 
mutex_lock(&devpriv->mutex);
if (comedi_dio_update_state(s, data)) {
+   /*multi-processor memory barrier*/
smp_mb();
outw_p(s->state, devpriv->BADR3);
udelay(10);
-- 
2.7.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: comedi: cb_pcidas64: Fixed coding issue about multiple line dereferencing

2016-12-19 Thread devendra sharma
Fixed coding issue about multiple line dereferencing

Signed-off-by: Devendra Sharma 
---
 drivers/staging/comedi/drivers/cb_pcidas64.c | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c 
b/drivers/staging/comedi/drivers/cb_pcidas64.c
index cb9c269..9ace9c0 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -2475,20 +2475,17 @@ static int setup_channel_queue(struct comedi_device 
*dev,
/* load external queue */
for (i = 0; i < cmd->chanlist_len; i++) {
bits = 0;
+   unsigned int ch = cmd->chanlist[i];
/* set channel */
-   bits |= adc_chan_bits(CR_CHAN(cmd->
- chanlist[i]));
+   bits |= adc_chan_bits(CR_CHAN(ch));
/* set gain */
bits |= ai_range_bits_6xxx(dev,
-  CR_RANGE(cmd->
-   chanlist
-   [i]));
+  CR_RANGE(ch));
/* set single-ended / differential */
bits |= se_diff_bit_6xxx(dev,
-CR_AREF(cmd->
-chanlist[i]) ==
+CR_AREF(ch) ==
 AREF_DIFF);
-   if (CR_AREF(cmd->chanlist[i]) == AREF_COMMON)
+   if (CR_AREF(ch) == AREF_COMMON)
bits |= ADC_COMMON_BIT;
/* mark end of queue */
if (i == cmd->chanlist_len - 1)
-- 
2.7.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel