Skip to contentSkip to conversation

Staging:comedi:cb_pcidas64=>Fixed check patch warnings

PATCH In review devendra sharma 3 participants 3 messages Dec 18, 2016 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging:comedi:cb_pcidas64=>Fixed check patch warnings

Fixed check patch warnings about multiple line dereferencing

---
 drivers/staging/comedi/drivers/cb_pcidas64.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/staging/comedi/drivers/cb_pcidas64.c +8 -12
index cb9c269..946c580 100644
@@ -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 */
Signature · 1 line
2.7.4
maintainer
#1 lore raw
Quoted 1 line · devendra sharma

Fixed check patch warnings about multiple line dereferencing

What does that mean?

Quoted 25 lines
---
 drivers/staging/comedi/drivers/cb_pcidas64.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/staging/comedi/drivers/cb_pcidas64.c +3 -4
index cb9c269..946c580 100644
@@ -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;
 		}

drivers/staging/comedi/drivers/cb_pcidas64.c static int setup_channel_queue(struct comedi_device *dev, · line 2479

Quoted 7 lines
drivers/staging/comedi/drivers/cb_pcidas64.c +2 -2
@@ -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]));

That doesn't look better to me, does it to you?

checkpatch is a guide, don't let it make you write code that isn't easy to understand.

thanks,

greg k-h

#2 lore raw
In reply to devendra sharma
Quoted 1 line · devendra sharma

Fixed check patch warnings about multiple line dereferencing

[].

drivers/staging/comedi/drivers/cb_pcidas64.c

Quoted 1 line
drivers/staging/comedi/drivers/cb_pcidas64.c +0 -0

[]

Quoted 14 lines
drivers/staging/comedi/drivers/cb_pcidas64.c +3 -5
@@ -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]));

drivers/staging/comedi/drivers/cb_pcidas64.c static int setup_channel_queue(struct comedi_device *dev, · line 2489

Quoted 10 lines
drivers/staging/comedi/drivers/cb_pcidas64.c +2 -3
 				/* 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 */

This would be better handled by using a temporary like:

 			for (i = 0; i < cmd->chanlist_len; i++) {
				<type> list = cmd->chanlist[i];

				/* set channel */
				bits |= adc_chan_bits(CR_CHAN(list));
				/* set gain */
				bits |= ai_range_bmts_6xxx(dev, CR_RANGE(list));
				/* set single-ended / differential */
				bits |= se_diff_bit_6xxx(dev,
							 CR_AREF(list) == AREF_DIFF);
				if (CR_AREF(list) == AREF_COMMON)
					bits |= ADC_COMMON_BIT;

Or moving the indented block into a separate function.