lkml.org 
[lkml]   [2014]   [Dec]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/3] comedi: checkpatch error/warning: spaces
On 28/12/14 18:56, Andreas Siegling wrote:
> This patch will fix the following checkpatch errors/warnings in
> drivers/staging/comedi/ which are brought by wrong spacing:
> ERROR: trailing whitespace
> ERROR: space prohibited before that ',' (ctx:WxW)
> WARNING: please, no space before tabs
>
> Signed-off-by: Andreas Siegling <andreas.siegling@fau.de>
> Signed-off-by: Zhutao Lu <lvzhutao@gmail.com>
> ---
> drivers/staging/comedi/drivers/daqboard2000.c | 2 +-
> drivers/staging/comedi/drivers/das16m1.c | 2 +-
> drivers/staging/comedi/drivers/ni_at_a2150.c | 2 +-
> drivers/staging/comedi/drivers/ni_stc.h | 4 ++--
> drivers/staging/comedi/drivers/s626.c | 2 +-
> 5 files changed, 6 insertions(+), 6 deletions(-)

Those should really be split into separate patches, but as for your
PATCH 1/3 it's not worth fixing up the comments this way as they need
reformatting anyway.

> diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
> index 69e543a..bff4852 100644
> --- a/drivers/staging/comedi/drivers/ni_at_a2150.c
> +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
> @@ -108,7 +108,7 @@ TRIG_WAKE_EOS
> #define IRQ_LVL_BITS(x) (((x) & 0xf) << 4) /* sets irq level */
> #define FIFO_INTR_EN_BIT 0x100 /* enable fifo interrupts */
> #define FIFO_INTR_FHF_BIT 0x200 /* interrupt fifo half full */
> -#define DMA_INTR_EN_BIT 0x800 /* enable interrupt on dma terminal count */
> +#define DMA_INTR_EN_BIT 0x800 /* enable interrupt on dma terminal count */
> #define DMA_DEM_EN_BIT 0x1000 /* enables demand mode dma */
> #define I8253_BASE_REG 0x14
> #define I8253_MODE_REG 0x17
> diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
> index bd69c3f..bb76fe1 100644
> --- a/drivers/staging/comedi/drivers/ni_stc.h
> +++ b/drivers/staging/comedi/drivers/ni_stc.h
> @@ -166,7 +166,7 @@ enum Interrupt_B_Ack_Bits {
> #define AI_SCAN_IN_PROG_Pulse _bit4
> #define AI_EXTMUX_CLK_Pulse _bit3
> #define AI_LOCALMUX_CLK_Pulse _bit2
> -#define AI_SC_TC_Pulse _bit1
> +#define AI_SC_TC_Pulse _bit1
> #define AI_CONVERT_Pulse _bit0
>
> #define AO_Command_1_Register 9
> @@ -642,7 +642,7 @@ static unsigned AO_UPDATE_Output_Select(enum ao_update_output_selection
> #define G_Load_Source_Select _bit7
> #define G_Reload_Source_Switching _bit15
> #define G_Loading_On_Gate _bit14
> -#define G_Gate_Polarity _bit13
> +#define G_Gate_Polarity _bit13
>
> #define G_Counting_Once(a) (((a)&0x03)<<10)
> #define G_Stop_Mode(a) (((a)&0x03)<<5)

Those parts of the patch are okay.

> diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
> index 14932c5..fc497dd 100644
> --- a/drivers/staging/comedi/drivers/s626.c
> +++ b/drivers/staging/comedi/drivers/s626.c
> @@ -118,7 +118,7 @@ static void s626_mc_enable(struct comedi_device *dev,
> static void s626_mc_disable(struct comedi_device *dev,
> unsigned int cmd, unsigned int reg)
> {
> - writel(cmd << 16 , dev->mmio + reg);
> + writel(cmd << 16, dev->mmio + reg);
> mmiowb();
> }

That part of the patch has also been tackled in a separate patch by
jitendra kumar khasdev. Your patch predates it, but jitendra's patch is
split better.

--
-=( Ian Abbott @ MEV Ltd. E-mail: <abbotti@mev.co.uk> )=-
-=( Web: http://www.mev.co.uk/ )=-


\
 
 \ /
  Last update: 2014-12-31 00:01    [W:0.060 / U:0.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site