From: horms@vergenet.net
To: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>, Peter Huewe <PeterHuewe@gmx.de>
Subject: [patch 1/6] otus: dont mix declarations and code
Date: Fri, 08 Jan 2010 18:57:49 +1100 [thread overview]
Message-ID: <20100108075920.554998528@vergenet.net> (raw)
In-Reply-To: <20100108075748.059645106@vergenet.net>
[-- Attachment #1: otus-c99.patch --]
[-- Type: text/plain, Size: 1595 bytes --]
$ 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>
Index: linux-2.6/drivers/staging/otus/ioctl.c
===================================================================
--- linux-2.6.orig/drivers/staging/otus/ioctl.c 2010-01-08 16:52:19.000000000 +1100
+++ linux-2.6/drivers/staging/otus/ioctl.c 2010-01-08 17:07:55.000000000 +1100
@@ -2227,7 +2227,8 @@ int usbdrv_wpa_ioctl(struct net_device *
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 *
/* 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 *
* #endif
*/
break;
+ }
/* #ifdef ZM_HOSTAPD_SUPPORT */
case ZD_CMD_GET_TSC:
next prev parent reply other threads:[~2010-01-08 8:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-08 7:57 [patch 0/6] otus: build fixes horms
2010-01-08 7:57 ` horms [this message]
2010-01-08 7:57 ` [patch 2/6] otus: remove unused variables horms
2010-01-08 7:57 ` [patch 3/6] otus: remove unused constants horms
2010-01-08 7:57 ` [patch 4/6] otus: Fix ZM_SEQ_DEBUG macro for no-debug case horms
2010-01-08 7:57 ` [patch 5/6] otus: zfTkipInit(): increment pointer horms
2010-01-09 8:44 ` [patch] otus: zfTkipInit(): increment another pointer Dan Carpenter
2010-01-12 0:50 ` [patch] tch 5/6 v2] " Simon Horman
2010-01-08 7:57 ` [patch 6/6] otus: zfRateCtrlRateDiff(): remove duplicate comparison horms
2010-01-09 8:44 ` Dan Carpenter
2010-01-11 13:06 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100108075920.554998528@vergenet.net \
--to=horms@vergenet.net \
--cc=PeterHuewe@gmx.de \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®