Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1544116 > unrolled thread

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

Started bydevendra sharma <devendra.sharma9091@gmail.com>
First post2016-12-18 11:20 +0100
Last post2016-12-18 18:40 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] Staging:comedi:cb_pcidas64=>Fixed check patch warnings devendra sharma <devendra.sharma9091@gmail.com> - 2016-12-18 11:20 +0100
    Re: [PATCH] Staging:comedi:cb_pcidas64=>Fixed check patch warnings Greg KH <gregkh@linuxfoundation.org> - 2016-12-18 11:40 +0100
    Re: [PATCH] Staging:comedi:cb_pcidas64=>Fixed check patch warnings Joe Perches <joe@perches.com> - 2016-12-18 18:40 +0100

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

Fromdevendra sharma <devendra.sharma9091@gmail.com>
Date2016-12-18 11:20 +0100
Subject[PATCH] Staging:comedi:cb_pcidas64=>Fixed check patch warnings
Message-ID<sPGJs-6tT-25@gated-at.bofh.it>
Fixed check patch warnings about multiple line dereferencing

Signed-off-by: Devendra Sharma <devendra.sharma9091@gmail.com>
---
 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

[toc] | [next] | [standalone]


#1544117

FromGreg KH <gregkh@linuxfoundation.org>
Date2016-12-18 11:40 +0100
Message-ID<sPH2O-6AZ-9@gated-at.bofh.it>
In reply to#1544116
On Sun, Dec 18, 2016 at 03:43:15PM +0530, devendra sharma wrote:
> Fixed check patch warnings about multiple line dereferencing

What does that mean?

> 
> Signed-off-by: Devendra Sharma <devendra.sharma9091@gmail.com>
> ---
>  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]));

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

[toc] | [prev] | [next] | [standalone]


#1544179

FromJoe Perches <joe@perches.com>
Date2016-12-18 18:40 +0100
Message-ID<sPNBg-3KK-23@gated-at.bofh.it>
In reply to#1544116
On Sun, 2016-12-18 at 15:43 +0530, devendra sharma wrote:
> Fixed check patch warnings about multiple line dereferencing
[].
> diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
[]
> @@ -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 */

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.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web