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>

diff --cc drivers/staging/comedi/drivers/ni_660x.c
index f74fc5e6ba20aa86c33f8f5c97fe5d9848c8dfe1,df61e5a03ae1eb6f7bd450251176fe04883c70f6..017630fb2424d874503acc335ec8789db8da58f6
--- 1/drivers/staging/comedi/drivers/ni_660x.c
--- 2/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/ni_labpc.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcmad.c
index 44ed777599c4fc1218a3ab6c7aa6b393ed2d47cc,f7991a9e0a78327c9dbc816ee502025bc125db0c..fab8092bd7aa7600e62139ce16db426a104f5614
--- 1/drivers/staging/comedi/drivers/pcmad.c
--- 2/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/comedi/drivers/poc.c
Simple merge

diff --cc drivers/staging/dream/camera/msm_camera.c
Simple merge

diff --cc drivers/staging/dream/camera/s5k3e2fx.c
Simple merge

diff --cc drivers/staging/wlan-ng/hfa384x.h
Simple merge

diff --cc drivers/staging/wlan-ng/hfa384x_usb.c
Simple merge

diff --cc drivers/staging/wlan-ng/p80211conv.c
index 99c5ec45b00de4a82cd3fc7f344f79c031cf5a69,3ba5eabdb583adeba8e0972c060d1d6582cdefac..a1605fbc8092cb7e83b181401f9e8bc8d7b7b33c
--- 1/drivers/staging/wlan-ng/p80211conv.c
--- 2/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/p80211wext.c
Simple merge

diff --cc drivers/staging/wlan-ng/prism2fw.c
index b57601250dc7bcd44ab310eb16e729b0c3b9d69a,343614561f4ced3141df82004b5daa56311ac625..4be54cea6ad7bd8c029f9e9735aee19832f53170
--- 1/drivers/staging/wlan-ng/prism2fw.c
--- 2/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);

diff --cc drivers/staging/wlan-ng/prism2mib.c
Simple merge

diff --cc drivers/staging/wlan-ng/prism2sta.c
Simple merge