Staging: otus: dont mix declarations and code

$ gcc (Debian 4.4.2-8) 4.4.2
Copyright (C) 2009 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

$ make
...
drivers/staging/otus/ioctl.c: In function 'usbdrv_wpa_ioctl':
drivers/staging/otus/ioctl.c:2253: warning: ISO C90 forbids mixed declarations and code
...

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
index 86d93330acad4db399ced8b1874208d8654bcf35..ebaedb7b1688ed687bbf249db3661efaa1b691d3 100644 (file)
--- a/drivers/staging/otus/ioctl.c
+++ b/drivers/staging/otus/ioctl.c
@@ -2227,7 +2227,8 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
        case ZD_CMD_SCAN_REQ:
                printk(KERN_ERR "usbdrv_wpa_ioctl: ZD_CMD_SCAN_REQ\n");
                break;
-       case ZD_CMD_SET_GENERIC_ELEMENT:
+       case ZD_CMD_SET_GENERIC_ELEMENT: {
+               u8_t len, *wpaie;
                printk(KERN_ERR "usbdrv_wpa_ioctl:"
                                        " ZD_CMD_SET_GENERIC_ELEMENT\n");
 
@@ -2250,8 +2251,8 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
                /* zfiWlanSetWpaIe(dev, zdparm->u.generic_elem.data,
                * zdparm->u.generic_elem.len);
                */
-               u8_t len = zdparm->u.generic_elem.len;
-               u8_t *wpaie = (u8_t *)zdparm->u.generic_elem.data;
+               len = zdparm->u.generic_elem.len;
+               wpaie = zdparm->u.generic_elem.data;
 
                printk(KERN_ERR "wd->ap.wpaLen : % d\n", len);
 
@@ -2273,6 +2274,7 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
                * #endif
                */
                break;
+       }
 
        /* #ifdef ZM_HOSTAPD_SUPPORT */
        case ZD_CMD_GET_TSC: