Re: [Outreachy kernel] [PATCH 3/3] staging: sm750fb: Alignment should match open parenthesis

[Julia Lawall]

On Sat, 11 Mar 2017, Arushi Singhal wrote:

> Fix checkpatch issues: "CHECK: Alignment should match open parenthesis".
>
> Signed-off-by: Arushi Singhal <arushisinghal19971997@xxxxxxxxx>
> ---
>  drivers/staging/sm750fb/ddk750_mode.c | 79 +++++++++++++++++------------------
>  1 file changed, 39 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/staging/sm750fb/ddk750_mode.c b/drivers/staging/sm750fb/ddk750_mode.c
> index 45af806c8d55..eea5aef2956f 100644
> --- a/drivers/staging/sm750fb/ddk750_mode.c
> +++ b/drivers/staging/sm750fb/ddk750_mode.c
> @@ -28,9 +28,9 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam,
>  	poke32(CRT_AUTO_CENTERING_TL, 0);
>
>  	poke32(CRT_AUTO_CENTERING_BR,
> -		(((y - 1) << CRT_AUTO_CENTERING_BR_BOTTOM_SHIFT) &
> -			CRT_AUTO_CENTERING_BR_BOTTOM_MASK) |
> -		((x - 1) & CRT_AUTO_CENTERING_BR_RIGHT_MASK));
> +	       (((y - 1) << CRT_AUTO_CENTERING_BR_BOTTOM_SHIFT) &
> +		CRT_AUTO_CENTERING_BR_BOTTOM_MASK) |
> +	       ((x - 1) & CRT_AUTO_CENTERING_BR_RIGHT_MASK));
>
>  	/*
>  	 * Assume common fields in dispControl have been properly set before
> @@ -72,8 +72,7 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam,
>  }
>
>  /* only timing related registers will be  programed */
> -static int programModeRegisters(mode_parameter_t *pModeParam,
> -						struct pll_value *pll)
> +static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value *pll)
>  {
>  	int ret = 0;
>  	int cnt = 0;
> @@ -83,32 +82,32 @@ static int programModeRegisters(mode_parameter_t *pModeParam,
>  		/* programe secondary pixel clock */
>  		poke32(CRT_PLL_CTRL, sm750_format_pll_reg(pll));
>  		poke32(CRT_HORIZONTAL_TOTAL,
> -			(((pModeParam->horizontal_total - 1) <<
> -				CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) &
> -				CRT_HORIZONTAL_TOTAL_TOTAL_MASK) |
> -			((pModeParam->horizontal_display_end - 1) &
> -				CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK));
> +		       (((pModeParam->horizontal_total - 1) <<
> +			 CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) &
> +			CRT_HORIZONTAL_TOTAL_TOTAL_MASK) |
> +		       ((pModeParam->horizontal_display_end - 1) &
> +			CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK));

This code seems quite hard to read.  Maybe you could introduce some new
variables based on the parameter names of poke32, and store the argument
of poke32 in those variables before making the call.  Then you could also
shorten the names of the constants a little, by using HORIZ and VERT
instead of HORIZONTAL and VERTICAL.  That might let eg the shift
operations fit on one line.

To find out the types of the new variables, you would need to look at the
definition of poke32 and see how the variables are used there.
Unfortunately poke32 is a macro, so it doesn't give type information
directly.

julia


>
>  		poke32(CRT_HORIZONTAL_SYNC,
> -			((pModeParam->horizontal_sync_width <<
> -				CRT_HORIZONTAL_SYNC_WIDTH_SHIFT) &
> -				CRT_HORIZONTAL_SYNC_WIDTH_MASK) |
> -			((pModeParam->horizontal_sync_start - 1) &
> -				CRT_HORIZONTAL_SYNC_START_MASK));
> +		       ((pModeParam->horizontal_sync_width <<
> +			 CRT_HORIZONTAL_SYNC_WIDTH_SHIFT) &
> +			CRT_HORIZONTAL_SYNC_WIDTH_MASK) |
> +		       ((pModeParam->horizontal_sync_start - 1) &
> +			CRT_HORIZONTAL_SYNC_START_MASK));
>
>  		poke32(CRT_VERTICAL_TOTAL,
> -			(((pModeParam->vertical_total - 1) <<
> -				CRT_VERTICAL_TOTAL_TOTAL_SHIFT) &
> -				CRT_VERTICAL_TOTAL_TOTAL_MASK) |
> -			((pModeParam->vertical_display_end - 1) &
> -				CRT_VERTICAL_TOTAL_DISPLAY_END_MASK));
> +		       (((pModeParam->vertical_total - 1) <<
> +			 CRT_VERTICAL_TOTAL_TOTAL_SHIFT) &
> +			CRT_VERTICAL_TOTAL_TOTAL_MASK) |
> +		       ((pModeParam->vertical_display_end - 1) &
> +			CRT_VERTICAL_TOTAL_DISPLAY_END_MASK));
>
>  		poke32(CRT_VERTICAL_SYNC,
> -			((pModeParam->vertical_sync_height <<
> -				CRT_VERTICAL_SYNC_HEIGHT_SHIFT) &
> -				CRT_VERTICAL_SYNC_HEIGHT_MASK) |
> -			((pModeParam->vertical_sync_start - 1) &
> -				CRT_VERTICAL_SYNC_START_MASK));
> +		       ((pModeParam->vertical_sync_height <<
> +			 CRT_VERTICAL_SYNC_HEIGHT_SHIFT) &
> +			CRT_VERTICAL_SYNC_HEIGHT_MASK) |
> +		       ((pModeParam->vertical_sync_start - 1) &
> +			CRT_VERTICAL_SYNC_START_MASK));
>
>  		tmp = DISPLAY_CTRL_TIMING | DISPLAY_CTRL_PLANE;
>  		if (pModeParam->vertical_sync_polarity)
> @@ -140,25 +139,25 @@ static int programModeRegisters(mode_parameter_t *pModeParam,
>  		poke32(PANEL_HORIZONTAL_TOTAL, reg);
>
>  		poke32(PANEL_HORIZONTAL_SYNC,
> -			((pModeParam->horizontal_sync_width <<
> -				PANEL_HORIZONTAL_SYNC_WIDTH_SHIFT) &
> -				PANEL_HORIZONTAL_SYNC_WIDTH_MASK) |
> -			((pModeParam->horizontal_sync_start - 1) &
> -				PANEL_HORIZONTAL_SYNC_START_MASK));
> +		       ((pModeParam->horizontal_sync_width <<
> +			 PANEL_HORIZONTAL_SYNC_WIDTH_SHIFT) &
> +			PANEL_HORIZONTAL_SYNC_WIDTH_MASK) |
> +		       ((pModeParam->horizontal_sync_start - 1) &
> +			PANEL_HORIZONTAL_SYNC_START_MASK));
>
>  		poke32(PANEL_VERTICAL_TOTAL,
> -			(((pModeParam->vertical_total - 1) <<
> -				PANEL_VERTICAL_TOTAL_TOTAL_SHIFT) &
> -				PANEL_VERTICAL_TOTAL_TOTAL_MASK) |
> -			((pModeParam->vertical_display_end - 1) &
> -				PANEL_VERTICAL_TOTAL_DISPLAY_END_MASK));
> +		       (((pModeParam->vertical_total - 1) <<
> +			 PANEL_VERTICAL_TOTAL_TOTAL_SHIFT) &
> +			PANEL_VERTICAL_TOTAL_TOTAL_MASK) |
> +		       ((pModeParam->vertical_display_end - 1) &
> +			PANEL_VERTICAL_TOTAL_DISPLAY_END_MASK));
>
>  		poke32(PANEL_VERTICAL_SYNC,
> -			((pModeParam->vertical_sync_height <<
> -				PANEL_VERTICAL_SYNC_HEIGHT_SHIFT) &
> -				PANEL_VERTICAL_SYNC_HEIGHT_MASK) |
> -			((pModeParam->vertical_sync_start - 1) &
> -				PANEL_VERTICAL_SYNC_START_MASK));
> +		       ((pModeParam->vertical_sync_height <<
> +			 PANEL_VERTICAL_SYNC_HEIGHT_SHIFT) &
> +			PANEL_VERTICAL_SYNC_HEIGHT_MASK) |
> +		       ((pModeParam->vertical_sync_start - 1) &
> +			PANEL_VERTICAL_SYNC_START_MASK));
>
>  		tmp = DISPLAY_CTRL_TIMING | DISPLAY_CTRL_PLANE;
>  		if (pModeParam->vertical_sync_polarity)
> --
> 2.11.0
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@xxxxxxxxxxxxxxxxx
> To post to this group, send email to outreachy-kernel@xxxxxxxxxxxxxxxxx
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170311032410.8265-4-arushisinghal19971997%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>