[PATCH 1/2] staging: comedi: cleanup formating in drivers/8255.c

[PATCH 1/2] staging: comedi: cleanup formating in drivers/8255.c

[Bruce Jones]

Clean up the formatting of braces to meet the coding standard.

Signed-off-by: Bruce Jones <brucej@linux.com>
---
 drivers/staging/comedi/drivers/8255.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index 0a50864..8ad3520 100644
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -179,15 +179,14 @@ static int subdev_8255_insn_config(struct comedi_device *dev,
 	unsigned int bits;
 
 	mask = 1 << CR_CHAN(insn->chanspec);
-	if (mask & 0x0000ff) {
+	if (mask & 0x0000ff)
 		bits = 0x0000ff;
-	} else if (mask & 0x00ff00) {
+	else if (mask & 0x00ff00)
 		bits = 0x00ff00;
-	} else if (mask & 0x0f0000) {
+	else if (mask & 0x0f0000)
 		bits = 0x0f0000;
-	} else {
+	else
 		bits = 0xf00000;
-	}
 
 	switch (data[0]) {
 	case INSN_CONFIG_DIO_INPUT:
@@ -333,11 +332,10 @@ int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s,
 		return -ENOMEM;
 
 	CALLBACK_ARG = arg;
-	if (cb == NULL) {
+	if (cb == NULL)
 		CALLBACK_FUNC = subdev_8255_cb;
-	} else {
+	else
 		CALLBACK_FUNC = cb;
-	}
 	s->insn_bits = subdev_8255_insn;
 	s->insn_config = subdev_8255_insn_config;
 
-- 
1.6.5.rc2

Re: [PATCH 1/2] staging: comedi: cleanup formating in drivers/8255.c

[Greg KH]

On Fri, Sep 25, 2009 at 09:33:20PM -0700, Bruce Jones wrote:
> Clean up the formatting of braces to meet the coding standard.

Sorry, someone already cleaned up the braces in this file, and beat you
to it.  What was the odds (hint, very low, pick another file and you
should be fine.)

thanks,

greg k-h