From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 4 Mar 2010 16:14:54 +0000 (-0800)
Subject: Staging: Merge two branches of coding style fixes together
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b02957d58a27525499ab10d272d3b44682a7ae50;p=openwrt%2Fstaging%2Fblogic.git

Staging: Merge two branches of coding style fixes together

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: Greg Kroah-Hartman <gregkh@suse.de>
---

b02957d58a27525499ab10d272d3b44682a7ae50
diff --cc drivers/staging/comedi/drivers/ni_660x.c
index f74fc5e6ba20,df61e5a03ae1..017630fb2424
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@@ -200,7 -199,7 +199,7 @@@ struct NI_660xRegisterData 
  	const char *name;	/*  Register Name */
  	int offset;		/*  Offset from base address from GPCT chip */
  	enum ni_660x_register_direction direction;
- 	enum ni_660x_register_width size; /*  1 byte, 2 bytes, or 4 bytes */
 -	enum ni_660x_register_width size;	/*1 byte, 2 bytes, or 4 bytes*/
++	enum ni_660x_register_width size; /* 1 byte, 2 bytes, or 4 bytes */
  };
  
  static const struct NI_660xRegisterData registerData[NumRegisters] = {
diff --cc drivers/staging/comedi/drivers/pcmad.c
index 44ed777599c4,f7991a9e0a78..fab8092bd7aa
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@@ -134,12 -134,11 +134,12 @@@ static int pcmad_attach(struct comedi_d
  	unsigned long iobase;
  
  	iobase = it->options[0];
- 	printk(KERN_NOTICE "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
+ 	printk(KERN_INFO "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
  	if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {
 -		printk("I/O port conflict\n");
 +		printk(KERN_CONT "I/O port conflict\n");
  		return -EIO;
  	}
 +	printk(KERN_CONT "\n");
  	dev->iobase = iobase;
  
  	ret = alloc_subdevices(dev, 1);
diff --cc drivers/staging/wlan-ng/p80211conv.c
index 99c5ec45b00d,3ba5eabdb583..a1605fbc8092
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@@ -206,11 -206,10 +206,10 @@@ int skb_ether_to_p80211(wlandevice_t *w
  		/* XXXX need to pick keynum other than default? */
  
  		p80211_wep->data = kmalloc(skb->len, GFP_ATOMIC);
 -
  		foo = wep_encrypt(wlandev, skb->data, p80211_wep->data,
- 			skb->len,
- 			(wlandev->hostwep &
- 			HOSTWEP_DEFAULTKEY_MASK),
- 			p80211_wep->iv, p80211_wep->icv);
 -				  skb->len, (wlandev->hostwep &HOSTWEP_DEFAULTKEY_MASK),
++				  skb->len,
++				  (wlandev->hostwep &HOSTWEP_DEFAULTKEY_MASK),
+ 				  p80211_wep->iv, p80211_wep->icv);
  		if (foo) {
  			printk(KERN_WARNING
  			       "Host en-WEP failed, dropping frame (%d).\n",
diff --cc drivers/staging/wlan-ng/prism2fw.c
index b57601250dc7,343614561f4c..4be54cea6ad7
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@@ -1158,10 -1157,7 +1158,10 @@@ int validate_identity(void
  			}
  			/* SEC compat range */
  			if ((s3info[i].info.compat.role == 1) &&
 -			    (s3info[i].info.compat.id == 4))
 +			    (s3info[i].info.compat.id == 4)) {
-                 /* FIXME: isn't something missing here? */
++				/* FIXME: isn't something missing here? */
 +			}
 +
  			break;
  		case 3:
  			pr_debug("Seq: %#x\n", s3info[i].info.buildseq);