1. 04 Mar, 2010 40 commits
    • Greg Kroah-Hartman's avatar
      Staging: merge staging patches into Linus's main branch · f341dddf
      Greg Kroah-Hartman authored
      There were a number of patches that went into Linus's
      tree already that conflicted with other changes in the
      staging branch.  This merge resolves those merge conflicts.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      f341dddf
    • Greg Kroah-Hartman's avatar
      Staging: Merge two branches of coding style fixes together · b02957d5
      Greg Kroah-Hartman authored
      Turns out that multiple people sent pretty much the same patch
      for the same staging drivers.  Commit these in two different
      branches and merge them together to get a more complete coverage
      of the cleanup and properly credit everyone for the work that they
      did.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      b02957d5
    • Chihau Chau's avatar
      Staging: dream: camera: sk5k3e2fx: fix code style issues · b94c765a
      Chihau Chau authored
      This fixes some code style issues about assignments in if conditions.
      Signed-off-by: default avatarChihau Chau <chihau@gmail.com>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      b94c765a
    • Chihau Chau's avatar
      Staging: dream: camera: msm_camera: fix code style issues · df84f941
      Chihau Chau authored
      This fixes some code style issues like to add one space after a while or
      switch statement and before a open parenthesis '(', and to include KERN_
      facility level in the printk() functions.
      Signed-off-by: default avatarChihau Chau <chihau@gmail.com>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      df84f941
    • Andrew Elwell's avatar
    • Andrew Elwell's avatar
      Staging: wlan-ng - checkpatch.pl fixups · ef1a0ed7
      Andrew Elwell authored
      Basic fixups in the staging/wlan-ng directory.
      (First kernel patch - thanks to FOSDEM talk)
      Signed-off-by: default avatarAndrew Elwell <Andrew.Elwell@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      ef1a0ed7
    • Andrea Gelmini's avatar
      Staging: comedi: comedi_fops.c: Checkpatch cleanup · 6705b68d
      Andrea Gelmini authored
      ERROR: do not initialise externals to 0 or NULL
      +int comedi_num_legacy_minors = 0;
      
      WARNING: braces {} are not necessary for single statement blocks
      +			if (s->subdev_flags & SDF_CMD_READ) {
      +				kill_fasync(&dev->async_queue, SIGIO, POLL_IN);
      +			}
      
      WARNING: braces {} are not necessary for single statement blocks
      +			if (s->subdev_flags & SDF_CMD_WRITE) {
      +				kill_fasync(&dev->async_queue, SIGIO, POLL_OUT);
      +			}
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      6705b68d
    • Stewart Robertson's avatar
      Staging: comedi: fix suspect code indent in ni_labpc.c · 639b9f1e
      Stewart Robertson authored
      This is a patch to the ni_labpc.c file that fixes suspect code indent for
      conditional statements found by the checkpatch.pl tool
      Signed-off-by: default avatarStewart Robertson <stewart_r@aliencamel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      639b9f1e
    • Maurice Dawson's avatar
      Staging: comedi: fix yet another brace coding style issue in ni_labpc.c · 65d6d26c
      Maurice Dawson authored
      This is a patch to the ni_labpc.c file that fixes up all the brace
      warnings found by the checkpatch.pl tool
      Signed-off-by: default avatarMaurice Dawson <mauricedawson2699@googlemail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      65d6d26c
    • Maurice Dawson's avatar
      Staging: comedi: fix another brace coding style issues in ni_labpc.c · 2bb9c335
      Maurice Dawson authored
      This is a patch to the ni_labpc.c file that fixes up a brace warning
      found by the checkpatch.pl tool
      Signed-off-by: default avatarMaurice Dawson <mauricedawson2699@googlemail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      2bb9c335
    • Maurice Dawson's avatar
      Staging: comedi: fix brace coding style issue in ni_labpc.c · 8377e813
      Maurice Dawson authored
      This is a patch to the ni_labpc.c file that fixes up a brace warning
      found by the checkpatch.pl tool.
      Signed-off-by: default avatarMaurice Dawson <maurice2699@btinternet.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      8377e813
    • Chihau Chau's avatar
      Staging: comedi: poc: Adding some KERN_ facility level · a917d4c4
      Chihau Chau authored
      This fixes some coding style issues like include KERN_ facility levels
      in some printk() and one trailing whitespace error.
      Signed-off-by: default avatarChihau Chau <chihau@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a917d4c4
    • Chihau Chau's avatar
      Staging: dream: camera: msm_camera: fix some code style issues · d4023a5e
      Chihau Chau authored
      This fixes some code style issues like else staments after the close
      braces '}' and to use __func__ instead of __FUNCTION__.
      Signed-off-by: default avatarChihau Chau <chihau@gmail.com>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      d4023a5e
    • Alessandro Ghedini's avatar
      Staging: wlan-ng: fix most of the style issues in hfa384x.h · 71508ee4
      Alessandro Ghedini authored
      This patch fixes all the errors and the majority of the warnings found with
      checkpatch.pl script in hfa384x.h, following Gábor Stefanik hints
      Signed-off-by: default avatarAlessandro Ghedini <al3xbio@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      71508ee4
    • Chihau Chau's avatar
      Staging: dream: camera: msm_camera: fix coding style issues · 49c9b5c7
      Chihau Chau authored
      This fixes some coding style issues like to use __func__ instead
      __FUNCTION__, "foo *bar" instead "foo* bar" and a initial comment with
      "/* */" instead "//"
      Signed-off-by: default avatarChihau Chau <chihau@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      49c9b5c7
    • Graham M Howe's avatar
      Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.c · 0054a361
      Graham M Howe authored
      This is a patch to the ni_660x.c file that fixes up the brace and 80
      character issues found by the checkpatch tool
      Signed-off-by: default avatarGraham M Howe <gmhowe@btopenworld.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      0054a361
    • Graham M Howe's avatar
      Staging: comedi: fix bracing coding style issue in ni_65xx.c · c2ca6a47
      Graham M Howe authored
      This is a patch to the ni_65xx.c file that fixes up a brace
      warning found by the checkpatch.pl tool
      Signed-off-by: default avatarGraham M Howe <gmhowe@btopenworld.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      c2ca6a47
    • Benjamin Adolphi's avatar
      Staging: comedi: pcmad: Checkpatch cleanups · dedf3ad1
      Benjamin Adolphi authored
      This fixes all checkpatch issues in the pcmad comedi driver.
      Signed-off-by: default avatarBenjamin Adolphi <b.adolphi@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      dedf3ad1
    • Chihau Chau's avatar
      Staging: comedi: poc: fix coding style issues · 52d83bde
      Chihau Chau authored
      This fixes a line over 80 characters and a brace warnings.
      Signed-off-by: default avatarChihau Chau <chihau@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      52d83bde
    • H Hartley Sweeten's avatar
      staging: dt3155: revert u_long to u64 usage · 3a8954e8
      H Hartley Sweeten authored
      Commit 9c1390a923ddb6fba1cf9d7440743369140c6d8a replaced
      all u_int's with u32 and u_long's with u64. Unfortunately, a u_long
      is still only 32-bits so they should have been replaced with u32 also.
      
      This can be verified by the register definitions in dt3155_io.h.  It
      specifically states that the memory mapped registers are 32-bit.
      
      Fix this by changing all the u64 to u32.
      Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
      Cc: Greg Kroah-Hartman <greg@kroah.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      3a8954e8
    • Andrea Gelmini's avatar
      Staging: comedi: drivers.c: Checkpatch cleanup · 5617f9da
      Andrea Gelmini authored
      WARNING: Use #include <linux/io.h> instead of <asm/io.h>
      +#include <asm/io.h>
      
      WARNING: braces {} are not necessary for any arm of this statement
      +	if (dev->driver) {
      [...]
      +	} else {
      [...]
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (insn->insn == INSN_READ) {
      +		data[0] = (new_data[1] >> (chan - base_bitfield_channel)) & 1;
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (async->prealloc_buf && async->prealloc_bufsz == new_size) {
      +		return 0;
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +				if (async->buf_page_list[i].virt_addr == NULL) {
      +					break;
      +				}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if ((int)(async->buf_write_alloc_count + nbytes - free_end) > 0) {
      +		nbytes = free_end - async->buf_write_alloc_count;
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if ((int)(async->buf_write_alloc_count + nbytes - free_end) > 0) {
      +		nbytes = 0;
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (async->buf_write_ptr >= async->prealloc_bufsz) {
      +		async->buf_write_ptr %= async->prealloc_bufsz;
      +	}
      
      Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      5617f9da
    • Andrea Gelmini's avatar
      Staging: arlan: arlan.h: more Checkpatch cleanup · b91665e9
      Andrea Gelmini authored
      ERROR: do not use C99 // comments
      +      volatile	u_char radioModule;// shows EEPROM, can be overridden at 0x111
      
      ERROR: do not use C99 // comments
      +      volatile	u_char defaultChannelSet; // shows EEProm, can be overriiden at 0x10A
      
      Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      b91665e9
    • Andrea Gelmini's avatar
      Staging: arlan: Makefile: Checkpatch cleanup · e22245b6
      Andrea Gelmini authored
      ERROR: trailing whitespace
      +obj-$(CONFIG_ARLAN) += arlan.o $
      
      Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      e22245b6
    • Andrea Gelmini's avatar
      Staging: rt3070: md4.h: Checkpatch cleanup · aa1468b3
      Andrea Gelmini authored
      WARNING: space prohibited between function name and open parenthesis '('
      +void MD4Init (MD4_CTX *);
      
      WARNING: space prohibited between function name and open parenthesis '('
      +void MD4Update (MD4_CTX *, u8 *, UINT);
      
      WARNING: space prohibited between function name and open parenthesis '('
      +void MD4Final (u8 [16], MD4_CTX *);
      
      ERROR: do not use C99 // comments
      +#endif //__MD4_H__
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      aa1468b3
    • Andrea Gelmini's avatar
      Staging: arlan: arlan.h: Checkpatch cleanup · a5a86959
      Andrea Gelmini authored
      ERROR: trailing whitespace
      + *  Copyright (C) 1998 Elmer.Joandi@ut.ee, +37-255-13500^I$
      
      WARNING: Use #include <linux/io.h> instead of <asm/io.h>
      +#include <asm/io.h>
      
      ERROR: do not use C99 // comments
      +//#define ARLAN_DEBUGGING 1
      
      ERROR: "foo * bar" should be "foo *bar"
      +extern int     arlan_command(struct net_device * dev, int command);
      
      ERROR: trailing whitespace
      + $
      
      ERROR: trailing whitespace
      +#define IFDEBUG( L ) if ( (L) & arlan_debug ) $
      
      ERROR: space prohibited after that open parenthesis '('
      +#define IFDEBUG( L ) if ( (L) & arlan_debug )
      
      ERROR: space prohibited before that close parenthesis ')'
      +#define IFDEBUG( L ) if ( (L) & arlan_debug )
      
      ERROR: trailing whitespace
      +#define ARLAN_FAKE_HDR_LEN 12 $
      
      ERROR: space required after that ',' (ctx:VxV)
      +	#define ARLAN_DEBUG(a,b) printk(KERN_DEBUG a, b)
       	                     ^
      
      ERROR: trailing whitespace
      +^I#define ARLAN_DEBUG(a,b) $
      
      ERROR: space required after that ',' (ctx:VxV)
      +	#define ARLAN_DEBUG(a,b)
       	                     ^
      
      ERROR: open brace '{' following struct go on the same line
      +struct arlan_shmem
      +{
      
      ERROR: trailing whitespace
      +      /* Header Signature */ $
      
      ERROR: trailing whitespace
      +      $
      
      ERROR: trailing whitespace
      +      $
      
      ERROR: trailing whitespace
      +      $
      
      ERROR: trailing whitespace
      +     $
      
      ERROR: trailing whitespace
      +      int systemId; $
      
      ERROR: open brace '{' following struct go on the same line
      +struct TxParam
      +{
      
      ERROR: "foo * bar" should be "foo *bar"
      +      struct arlan_shmem __iomem * card;
      
      ERROR: "foo * bar" should be "foo *bar"
      +      struct arlan_shmem * conf;
      
      ERROR: trailing whitespace
      +      struct arlan_conf_stru * Conf;^I     $
      
      ERROR: "foo * bar" should be "foo *bar"
      +      struct arlan_conf_stru * Conf;
      
      ERROR: trailing whitespace
      + $
      
      ERROR: space required after that ',' (ctx:VxV)
      +#define READSHM(to,from,atype) {\
                         ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +#define READSHM(to,from,atype) {\
                              ^
      
      ERROR: space required after that ',' (ctx:VxO)
      +	memcpy_fromio(&(tmp),&(from),sizeof(atype));\
       	                    ^
      
      ERROR: space required before that '&' (ctx:OxV)
      +	memcpy_fromio(&(tmp),&(from),sizeof(atype));\
       	                     ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +	memcpy_fromio(&(tmp),&(from),sizeof(atype));\
       	                            ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +#define READSHMEM(from,atype)\
                             ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +#define WRITESHM(to,from,atype) \
                          ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +#define WRITESHM(to,from,atype) \
                               ^
      
      ERROR: space required after that ',' (ctx:VxO)
      +	memcpy_toio(&(to),&tmpSHM,sizeof(atype));\
       	                 ^
      
      ERROR: space required before that '&' (ctx:OxV)
      +	memcpy_toio(&(to),&tmpSHM,sizeof(atype));\
       	                  ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +	memcpy_toio(&(to),&tmpSHM,sizeof(atype));\
       	                         ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \
                                ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \
                                          ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \
                                                ^
      
      ERROR: space required after that ',' (ctx:VxO)
      +		memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\
       		                     ^
      
      ERROR: space required before that '&' (ctx:OxV)
      +		memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\
       		                      ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +		memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\
       		                              ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +		IFDEBUG(levelSHM) printk(stringSHM,tmpSHM);\
       		                                  ^
      
      ERROR: space required after that ',' (ctx:VxO)
      +	writeb(val,&(to))
       	          ^
      
      ERROR: space required before that '&' (ctx:OxV)
      +	writeb(val,&(to))
       	           ^
      
      ERROR: space required after that ',' (ctx:VxO)
      +	writew(val,&(to))
       	          ^
      
      ERROR: space required before that '&' (ctx:OxV)
      +	writew(val,&(to))
       	           ^
      
      ERROR: space required after that ',' (ctx:VxO)
      +	writel(val,&(to))
       	          ^
      
      ERROR: space required before that '&' (ctx:OxV)
      +	writel(val,&(to))
       	           ^
      
      ERROR: space prohibited after that open parenthesis '('
      +   ( (   READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationMode)    > 0) && \
      
      ERROR: space prohibited after that open parenthesis '('
      +     (   READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0)    )
      
      ERROR: space prohibited before that close parenthesis ')'
      +     (   READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0)    )
      
      ERROR: code indent should use tabs where possible
      + ^IREADSHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage)$
      
      ERROR: space required before the open brace '{'
      +#define writeControlRegister(dev, v){\
      
      ERROR: space required after that ',' (ctx:WxV)
      +   WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage	,((v) &0xF) );\
                                                                                   	^
      
      ERROR: need consistent spacing around '&' (ctx:WxV)
      +   WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage	,((v) &0xF) );\
                                                                                   	      ^
      
      ERROR: space prohibited before that close parenthesis ')'
      +   WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage	,((v) &0xF) );\
      
      ERROR: space required after that ',' (ctx:WxV)
      +   WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister	,(v) 	);}
                                                                                     	^
      
      ERROR: space required after that ';' (ctx:VxV)
      +   WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister	,(v) 	);}
                                                                                     	     	 ^
      
      ERROR: space prohibited before that close parenthesis ')'
      +   WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister	,(v) 	);}
      
      WARNING: suspect code indent for conditional statements (3, 6)
      +   if (cr & ARLAN_CHANNEL_ATTENTION){ \
      +      writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\
      
      ERROR: space required before the open brace '{'
      +   if (cr & ARLAN_CHANNEL_ATTENTION){ \
      
      ERROR: space required after that close brace '}'
      +   }else  \
      
      ERROR: space required before the open brace '{'
      +#define clearChannelAttention(dev){ \
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CHANNEL_ATTENTION);}
                                  ^
      
      ERROR: space required after that ';' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CHANNEL_ATTENTION);}
                                                                                       ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) | ARLAN_RESET);}
                                  ^
      
      ERROR: space required after that ';' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) | ARLAN_RESET);}
                                                                          ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_RESET);}
                                  ^
      
      ERROR: space required after that ';' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_RESET);}
                                                                           ^
      
      ERROR: space required before the open brace '{'
      +#define setInterruptEnable(dev){\
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) | ARLAN_INTERRUPT_ENABLE)  ;}
                                  ^
      
      ERROR: space required after that ';' (ctx:WxV)
      +   writeControlRegister(dev,readControlRegister(dev) | ARLAN_INTERRUPT_ENABLE)  ;}
                                                                                       ^
      
      ERROR: space required before the open brace '{'
      +#define clearInterruptEnable(dev){\
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_INTERRUPT_ENABLE)  ;}
                                  ^
      
      ERROR: space required after that ';' (ctx:WxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_INTERRUPT_ENABLE)  ;}
                                                                                        ^
      
      ERROR: space required before the open brace '{'
      +#define setClearInterrupt(dev){\
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) | ARLAN_CLEAR_INTERRUPT)   ;}
                                  ^
      
      ERROR: space required after that ';' (ctx:WxV)
      +   writeControlRegister(dev,readControlRegister(dev) | ARLAN_CLEAR_INTERRUPT)   ;}
                                                                                       ^
      
      ERROR: space required before the open brace '{'
      +#define clearClearInterrupt(dev){\
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CLEAR_INTERRUPT);}
                                  ^
      
      ERROR: space required after that ';' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CLEAR_INTERRUPT);}
                                                                                     ^
      
      ERROR: space required before the open brace '{'
      +#define setPowerOff(dev){\
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) | (ARLAN_POWER && ARLAN_ACCESS));\
                                  ^
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);}
                                  ^
      
      ERROR: space required after that ';' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);}
                                                                            ^
      
      ERROR: space required before the open brace '{'
      +#define setPowerOn(dev){\
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~(ARLAN_POWER));   }
                                  ^
      
      ERROR: space required before the open brace '{'
      +#define arlan_lock_card_access(dev){\
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);}
                                  ^
      
      ERROR: space required after that ';' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);}
                                                                            ^
      
      ERROR: space required before the open brace '{'
      +#define arlan_unlock_card_access(dev){\
      
      ERROR: trailing whitespace
      +   writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); }  $
      
      ERROR: space required after that ',' (ctx:VxV)
      +   writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); }
                                  ^
      
      ERROR: space prohibited before that close parenthesis ')'
      +   writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); }
      
      ERROR: trailing whitespace
      + $
      
      ERROR: trailing whitespace
      + $
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a5a86959
    • Andrea Gelmini's avatar
      Staging: comedi: dt2801.c: Checkpatch cleanup · fa93e19d
      Andrea Gelmini authored
      ERROR: code indent should use tabs where possible
      +          0 = [-10,10]$
      
      ERROR: code indent should use tabs where possible
      +          0 = [-10,10]$
      
      WARNING: braces {} are not necessary for single statement blocks
      +		if (stat & (DT_S_COMPOSITE_ERROR | DT_S_READY)) {
      +			return stat;
      +		}
      
      WARNING: braces {} are not necessary for single statement blocks
      +		if (stat & DT_S_COMPOSITE_ERROR) {
      +			return stat;
      +		}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (stat & DT_S_READY) {
      +		return 0;
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +		if (stat & DT_S_COMPOSITE_ERROR) {
      +			return stat;
      +		}
      
      WARNING: braces {} are not necessary for single statement blocks
      +		if (stat & DT_S_READY) {
      +			return 0;
      +		}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (!(stat & DT_S_READY)) {
      +		printk("dt2801: !ready in dt2801_writecmd(), ignoring\n");
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (!timeout) {
      +		printk("dt2801: timeout 1 status=0x%02x\n", stat);
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (!timeout) {
      +		printk("dt2801: timeout 2 status=0x%02x\n", stat);
      +	}
      
      WARNING: braces {} are not necessary for any arm of this statement
      +		if (stat == -ETIME) {
      [...]
      +		} else {
      [...]
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      fa93e19d
    • Andrea Gelmini's avatar
      Staging: comedi: dmm32at.c: Checkpatch cleanup · 20962c10
      Andrea Gelmini authored
      WARNING: braces {} are not necessary for any arm of this statement
      +	if (data[0] == COMEDI_OUTPUT) {
      [...]
      +	} else {
      [...]
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      20962c10
    • Andrea Gelmini's avatar
      Staging: comedi: cb_pcimdas.c: more Checkpatch cleanup · 882e5b32
      Andrea Gelmini authored
      WARNING: braces {} are not necessary for single statement blocks
      +		if (fifo_empty) {
      +			break;
      +		}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (irq) {
      +		printk(", irq %u", irq);
      +	}
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      882e5b32
    • Andrea Gelmini's avatar
      Staging: comedi: das6402.c: Checkpatch cleanup · ecd89ddc
      Andrea Gelmini authored
      ERROR: Macros with complex values should be enclosed in parenthesis
      +#define N_WORDS 3000*64
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      ecd89ddc
    • Andrea Gelmini's avatar
      Staging: comedi: hwdrv_apci3120.c: Checkpatch cleanup · dd105f08
      Andrea Gelmini authored
      ERROR: do not initialise statics to 0 or NULL
      +static unsigned int ui_Temp = 0;
      
      WARNING: braces {} are not necessary for any arm of this statement
      +		if (data[1]) {
      [...]
      +		} else
      [...]
      
      WARNING: braces {} are not necessary for single statement blocks
      +		for (i = 0; i < devpriv->ui_AiNbrofChannels; i++) {
      +			devpriv->ui_AiChannelList[i] = data[4 + i];
      +		}
      
      ERROR: that open brace { should be on the previous line
      +	} else			/*  EOC */
      +	{
      
      WARNING: braces {} are not necessary for any arm of this statement
      +		if (data[1]) {
      [...]
      +		} else {
      [...]
      
      ERROR: that open brace { should be on the previous line
      +	if (insn->unused[0] == 222)	/*  second insn read */
      +	{
      
      WARNING: braces {} are not necessary for single statement blocks
      +		for (i = 0; i < insn->n; i++) {
      +			data[i] = devpriv->ui_AiReadData[i];
      +		}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) {
      +		err++;
      +	}
      
      ERROR: that open brace { should be on the previous line
      +	if (cmd->scan_begin_src == TRIG_TIMER)	/*  Test Delay timing */
      +	{
      
      ERROR: that open brace { should be on the previous line
      +	if (cmd->convert_src == TRIG_TIMER)	/*  Test Acquisition timing */
      +	{
      
      WARNING: braces {} are not necessary for any arm of this statement
      +	if (cmd->stop_src == TRIG_COUNT) {
      [...]
      +	} else {
      [...]
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (devpriv->b_ExttrigEnable == APCI3120_ENABLE) {
      +		i_APCI3120_ExttrigEnable(dev);	/*  activate EXT trigger */
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +			if (dmalen0 > (devpriv->ui_AiDataLength)) {
      +				dmalen0 = devpriv->ui_AiDataLength;
      +			}
      
      WARNING: braces {} are not necessary for single statement blocks
      +			if (dmalen1 > (devpriv->ui_AiDataLength)) {
      +				dmalen1 = devpriv->ui_AiDataLength;
      +			}
      
      WARNING: braces {} are not necessary for any arm of this statement
      +		if (CR_RANGE(chanlist[i]) < APCI3120_BIPOLAR_RANGES) {
      [...]
      +		} else {
      [...]
      
      ERROR: that open brace { should be on the previous line
      +		if (devpriv->b_EocEosInterrupt == APCI3120_ENABLE)	/*  enable this in without DMA ??? */
      +		{
      
      ERROR: that open brace { should be on the previous line
      +	if (data[0] == APCI3120_TIMER)	/* initialize timer */
      +	{
      
      ERROR: that open brace { should be on the previous line
      +	} else			/*  Initialize Watch dog */
      +	{
      
      ERROR: that open brace { should be on the previous line
      +	if (data[0] == 2)	/*  write new value */
      +	{
      
      ERROR: that open brace { should be on the previous line
      +		if (devpriv->b_Timer2Mode == APCI3120_TIMER)	/* start timer */
      +		{
      
      ERROR: that open brace { should be on the previous line
      +		} else		/* start watch dog */
      +		{
      
      ERROR: that open brace { should be on the previous line
      +		if (devpriv->b_Timer2Mode == APCI3120_TIMER)	/* start timer */
      +		{
      
      ERROR: that open brace { should be on the previous line
      +	} else			/*  Read watch dog status */
      +	{
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (!devpriv->b_OutputMemoryStatus) {
      +		ui_Temp = 0;
      +
      +	}			/* if(!devpriv->b_OutputMemoryStatus ) */
      
      ERROR: code indent should use tabs where possible
      +                      data[0]     Value to be written$
      
      ERROR: code indent should use tabs where possible
      +                      data[1]    :1 Set digital o/p ON$
      
      ERROR: code indent should use tabs where possible
      +                      data[1]     2 Set digital o/p OFF with memory ON$
      
      ERROR: that open brace { should be on the previous line
      +	if (ui_Range)		/*  if 1 then unipolar */
      +	{
      
      ERROR: that open brace { should be on the previous line
      +	} else			/*  if 0 then   bipolar */
      +	{
      
      ERROR: that open brace { should be on the previous line
      +	do			/* Waiting of DA_READY BIT */
      +	{
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      dd105f08
    • Andrea Gelmini's avatar
      Staging: comedi: das08_cs.c: Checkpatch cleanup · d539047c
      Andrea Gelmini authored
      ERROR: code indent should use tabs where possible
      +        NONE$
      
      ERROR: do not initialise statics to 0 or NULL
      +static struct pcmcia_device *cur_dev = NULL;
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      d539047c
    • Andrea Gelmini's avatar
      Staging: comedi: contec_pci_dio.c: Checkpatch cleanup · 426054ce
      Andrea Gelmini authored
      WARNING: braces {} are not necessary for single statement blocks
      +		if (dev->iobase) {
      +			comedi_pci_disable(devpriv->pci_dev);
      +		}
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      426054ce
    • Andrea Gelmini's avatar
      Staging: comedi: cb_pcimdda.c: Checkpatch cleanup · f1c54e82
      Andrea Gelmini authored
      WARNING: braces {} are not necessary for any arm of this statement
      +	if (it->options[2]) {
      [...]
      +	} else {
      [...]
      
      WARNING: braces {} are not necessary for single statement blocks
      +			if (devpriv->registers) {
      +				comedi_pci_disable(devpriv->pci_dev);
      +			}
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      f1c54e82
    • Andrea Gelmini's avatar
      Staging: comedi: cb_pcimdas.c: Checkpatch cleanup · 7c2f1946
      Andrea Gelmini authored
      WARNING: braces {} are not necessary for any arm of this statement
      +	if (thisboard->has_dio) {
      [...]
      +	} else {
      [...]
      
      WARNING: braces {} are not necessary for single statement blocks
      +			if (devpriv->BADR0) {
      +				comedi_pci_disable(devpriv->pci_dev);
      +			}
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      7c2f1946
    • Andrea Gelmini's avatar
      Staging: comedi: cb_pcidio.c: Checkpatch cleanup · e3a21d0a
      Andrea Gelmini authored
      WARNING: braces {} are not necessary for single statement blocks
      +			if (devpriv->dio_reg_base) {
      +				comedi_pci_disable(devpriv->pci_dev);
      +			}
      
      WARNING: braces {} are not necessary for single statement blocks
      +		for (i = 0; i < thisboard->n_8255; i++) {
      +			subdev_8255_cleanup(dev, dev->subdevices + i);
      +		}
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      e3a21d0a
    • Andrea Gelmini's avatar
      Staging: comedi: cb_pcidda.c: Checkpatch cleanup · 20db7d7d
      Andrea Gelmini authored
      WARNING: braces {} are not necessary for single statement blocks
      +			if (devpriv->dac) {
      +				comedi_pci_disable(devpriv->pci_dev);
      +			}
      
      WARNING: braces {} are not necessary for single statement blocks
      +		if (inw_p(devpriv->dac + DACALIBRATION1) & SERIAL_OUT_BIT) {
      +			value |= 1 << (value_width - i);
      +		}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	for (i = 0; i < max_num_caldacs; i++) {
      +		cal2_bits |= DESELECT_CALDAC_BIT(i);
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	for (i = 0; i < max_num_caldacs; i++) {
      +		cal2_bits |= DESELECT_CALDAC_BIT(i);
      +	}
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      20db7d7d
    • Andrea Gelmini's avatar
      Staging: comedi: cb_pcidas.c: Checkpatch cleanup · 2d238b29
      Andrea Gelmini authored
      ERROR: "foo * bar" should be "foo *bar"
      +		      uint8_t * data);
      
      WARNING: braces {} are not necessary for single statement blocks
      +		if (devpriv->s5933_config) {
      +			comedi_pci_disable(devpriv->pci_dev);
      +		}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (cmd->stop_src == TRIG_COUNT) {
      +		devpriv->count = cmd->chanlist_len * cmd->stop_arg;
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (cmd->stop_src == TRIG_COUNT) {
      +		devpriv->ao_count = cmd->chanlist_len * cmd->stop_arg;
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (cmd->stop_src == TRIG_COUNT) {
      +		devpriv->ao_count -= num_points;
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (dev->attached == 0) {
      +		return IRQ_NONE;
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if ((status & (INT | EOAI | LADFUL | DAHFI | DAEMI)) == 0) {
      +		comedi_error(dev, "spurious interrupt");
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +	if (status & (DAHFI | DAEMI)) {
      +		handle_ao_interrupt(dev, status);
      +	}
      
      WARNING: braces {} are not necessary for single statement blocks
      +		if (async->cmd.stop_src == TRIG_COUNT) {
      +			devpriv->ao_count -= num_points;
      +		}
      
      ERROR: "foo * bar" should be "foo *bar"
      +		      uint8_t * data)
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      2d238b29
    • Andrea Gelmini's avatar
      Staging: comedi: hwdrv_apci1032.c: Checkpatch cleanup · 882e1233
      Andrea Gelmini authored
      ERROR: do not initialise externals to 0 or NULL
      +unsigned int ui_InterruptStatus = 0;
      
      WARNING: braces {} are not necessary for single statement blocks
      +		else {
      +			outl(0x6, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
      +		}		/* else if(data[1] == ADDIDATA_OR) */
      
      WARNING: braces {} are not necessary for single statement blocks
      +		if (data[1] == 1) {
      +			*data = ui_InterruptStatus;
      +		}		/* if(data[1]==1) */
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      882e1233
    • Andrea Gelmini's avatar
      Staging: comedi: addi_common.h: Checkpatch cleanup · a9ecb5bb
      Andrea Gelmini authored
      ERROR: code indent should use tabs where possible
      +        const struct comedi_lrange *pr_AiRangelist;^I/* rangelist for A/D */$
      
      ERROR: code indent should use tabs where possible
      +        const struct comedi_lrange *pr_AoRangelist;^I/* rangelist for D/A */$
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a9ecb5bb
    • Andrea Gelmini's avatar
      Staging: comedi: addi_amcc_S5920.c: Checkpatch cleanup · 015fadba
      Andrea Gelmini authored
      WARNING: braces {} are not necessary for any arm of this statement
      +			if (i_Counter == 0) {
      [...]
      +			} else {
      [...]
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      015fadba