Re: [Outreachy kernel] [PATCH v2] staging: sm750fb: Add spaces around '|'

[Alison Schofield <amsfield22@gmail.com>]

On Fri, Sep 16, 2016 at 06:22:13PM +0530, Rehas Sachdeva wrote:
> Adds spaces on either side of a '|'. Issue dound by checkpatch.

spell check -> found
> 
> Signed-off-by: Rehas Sachdeva <aquannie@gmail.com>
> ---
> Change in v2:
> Refresh commit against the latest tree.

Hi Rehas,

This fails to apply to my tree.  It appears to be built upon
your other patchset:
[PATCH 0/5] staging: sm750fb: Fix multiple checkpatch warnings
which is still pending.

So, you can go at least 3 ways here..
- rebase now against a clean staging tree and resend
- wait til that patchset is in the staging tree.  rebase and resend
- pull it into that patchset.

alisons








> 
>  drivers/staging/sm750fb/ddk750_display.h | 44 ++++++++++++++++----------------
>  1 file changed, 22 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/staging/sm750fb/ddk750_display.h b/drivers/staging/sm750fb/ddk750_display.h
> index 04b8eba..f69d798 100644
> --- a/drivers/staging/sm750fb/ddk750_display.h
> +++ b/drivers/staging/sm750fb/ddk750_display.h
> @@ -8,8 +8,8 @@
>  #define PNL_2_OFFSET 0
>  #define PNL_2_MASK (3 << PNL_2_OFFSET)
>  #define PNL_2_USAGE	(PNL_2_MASK << 16)
> -#define PNL_2_PRI	((0 << PNL_2_OFFSET)|PNL_2_USAGE)
> -#define PNL_2_SEC	((2 << PNL_2_OFFSET)|PNL_2_USAGE)
> +#define PNL_2_PRI	((0 << PNL_2_OFFSET) | PNL_2_USAGE)
> +#define PNL_2_SEC	((2 << PNL_2_OFFSET) | PNL_2_USAGE)
>  
>  
>  /* primary timing & plane enable bit
> @@ -19,8 +19,8 @@
>  #define PRI_TP_OFFSET 4
>  #define PRI_TP_MASK BIT(PRI_TP_OFFSET)
>  #define PRI_TP_USAGE (PRI_TP_MASK << 16)
> -#define PRI_TP_ON ((0x1 << PRI_TP_OFFSET)|PRI_TP_USAGE)
> -#define PRI_TP_OFF ((0x0 << PRI_TP_OFFSET)|PRI_TP_USAGE)
> +#define PRI_TP_ON ((0x1 << PRI_TP_OFFSET) | PRI_TP_USAGE)
> +#define PRI_TP_OFF ((0x0 << PRI_TP_OFFSET) | PRI_TP_USAGE)
>  
>  
>  /* panel sequency status
> @@ -29,8 +29,8 @@
>  #define PNL_SEQ_OFFSET 6
>  #define PNL_SEQ_MASK BIT(PNL_SEQ_OFFSET)
>  #define PNL_SEQ_USAGE (PNL_SEQ_MASK << 16)
> -#define PNL_SEQ_ON (BIT(PNL_SEQ_OFFSET)|PNL_SEQ_USAGE)
> -#define PNL_SEQ_OFF ((0 << PNL_SEQ_OFFSET)|PNL_SEQ_USAGE)
> +#define PNL_SEQ_ON (BIT(PNL_SEQ_OFFSET) | PNL_SEQ_USAGE)
> +#define PNL_SEQ_OFF ((0 << PNL_SEQ_OFFSET) | PNL_SEQ_USAGE)
>  
>  /* dual digital output
>  	80000[19]
> @@ -38,8 +38,8 @@
>  #define DUAL_TFT_OFFSET 8
>  #define DUAL_TFT_MASK BIT(DUAL_TFT_OFFSET)
>  #define DUAL_TFT_USAGE (DUAL_TFT_MASK << 16)
> -#define DUAL_TFT_ON (BIT(DUAL_TFT_OFFSET)|DUAL_TFT_USAGE)
> -#define DUAL_TFT_OFF ((0 << DUAL_TFT_OFFSET)|DUAL_TFT_USAGE)
> +#define DUAL_TFT_ON (BIT(DUAL_TFT_OFFSET) | DUAL_TFT_USAGE)
> +#define DUAL_TFT_OFF ((0 << DUAL_TFT_OFFSET) | DUAL_TFT_USAGE)
>  
>  /* secondary timing & plane enable bit
>  	1:80200[8] & 80200[2] on
> @@ -48,8 +48,8 @@
>  #define SEC_TP_OFFSET 5
>  #define SEC_TP_MASK BIT(SEC_TP_OFFSET)
>  #define SEC_TP_USAGE (SEC_TP_MASK << 16)
> -#define SEC_TP_ON  ((0x1 << SEC_TP_OFFSET)|SEC_TP_USAGE)
> -#define SEC_TP_OFF ((0x0 << SEC_TP_OFFSET)|SEC_TP_USAGE)
> +#define SEC_TP_ON  ((0x1 << SEC_TP_OFFSET) | SEC_TP_USAGE)
> +#define SEC_TP_OFF ((0x0 << SEC_TP_OFFSET) | SEC_TP_USAGE)
>  
>  /* crt path select
>  	80200[19:18]
> @@ -57,8 +57,8 @@
>  #define CRT_2_OFFSET 2
>  #define CRT_2_MASK (3 << CRT_2_OFFSET)
>  #define CRT_2_USAGE (CRT_2_MASK << 16)
> -#define CRT_2_PRI ((0x0 << CRT_2_OFFSET)|CRT_2_USAGE)
> -#define CRT_2_SEC ((0x2 << CRT_2_OFFSET)|CRT_2_USAGE)
> +#define CRT_2_PRI ((0x0 << CRT_2_OFFSET) | CRT_2_USAGE)
> +#define CRT_2_SEC ((0x2 << CRT_2_OFFSET) | CRT_2_USAGE)
>  
>  
>  /* DAC affect both DVI and DSUB
> @@ -67,8 +67,8 @@
>  #define DAC_OFFSET 7
>  #define DAC_MASK BIT(DAC_OFFSET)
>  #define DAC_USAGE (DAC_MASK << 16)
> -#define DAC_ON ((0x0 << DAC_OFFSET)|DAC_USAGE)
> -#define DAC_OFF ((0x1 << DAC_OFFSET)|DAC_USAGE)
> +#define DAC_ON ((0x0 << DAC_OFFSET) | DAC_USAGE)
> +#define DAC_OFF ((0x1 << DAC_OFFSET) | DAC_USAGE)
>  
>  /* DPMS only affect D-SUB head
>  	0[31:30]
> @@ -76,8 +76,8 @@
>  #define DPMS_OFFSET 9
>  #define DPMS_MASK (3 << DPMS_OFFSET)
>  #define DPMS_USAGE (DPMS_MASK << 16)
> -#define DPMS_OFF ((3 << DPMS_OFFSET)|DPMS_USAGE)
> -#define DPMS_ON ((0 << DPMS_OFFSET)|DPMS_USAGE)
> +#define DPMS_OFF ((3 << DPMS_OFFSET) | DPMS_USAGE)
> +#define DPMS_ON ((0 << DPMS_OFFSET) | DPMS_USAGE)
>  
>  
>  
> @@ -86,16 +86,16 @@
>  	CRT means crt path DSUB
>  */
>  typedef enum _disp_output_t {
> -	do_LCD1_PRI = PNL_2_PRI|PRI_TP_ON|PNL_SEQ_ON|DAC_ON,
> -	do_LCD1_SEC = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON|DAC_ON,
> -	do_LCD2_PRI = CRT_2_PRI|PRI_TP_ON|DUAL_TFT_ON,
> -	do_LCD2_SEC = CRT_2_SEC|SEC_TP_ON|DUAL_TFT_ON,
> +	do_LCD1_PRI = PNL_2_PRI | PRI_TP_ON | PNL_SEQ_ON | DAC_ON,
> +	do_LCD1_SEC = PNL_2_SEC | SEC_TP_ON | PNL_SEQ_ON | DAC_ON,
> +	do_LCD2_PRI = CRT_2_PRI | PRI_TP_ON | DUAL_TFT_ON,
> +	do_LCD2_SEC = CRT_2_SEC | SEC_TP_ON | DUAL_TFT_ON,
>  	/*
>  	do_DSUB_PRI = CRT_2_PRI|PRI_TP_ON|DPMS_ON|DAC_ON,
>  	do_DSUB_SEC = CRT_2_SEC|SEC_TP_ON|DPMS_ON|DAC_ON,
>  	*/
> -	do_CRT_PRI = CRT_2_PRI|PRI_TP_ON|DPMS_ON|DAC_ON,
> -	do_CRT_SEC = CRT_2_SEC|SEC_TP_ON|DPMS_ON|DAC_ON,
> +	do_CRT_PRI = CRT_2_PRI | PRI_TP_ON | DPMS_ON | DAC_ON,
> +	do_CRT_SEC = CRT_2_SEC | SEC_TP_ON | DPMS_ON | DAC_ON,
>  }
>  
>  disp_output_t;
> -- 
> 2.7.4
> 
> -- 
> 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@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20160916125213.GA16144%40toblerone.
> For more options, visit https://groups.google.com/d/optout.