Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754660AbZFHIIv (ORCPT ); Mon, 8 Jun 2009 04:08:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753165AbZFHIIc (ORCPT ); Mon, 8 Jun 2009 04:08:32 -0400 Received: from rv-out-0506.google.com ([209.85.198.231]:15528 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754477AbZFHIIa (ORCPT ); Mon, 8 Jun 2009 04:08:30 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=dAH52/ZgOIz7Qb7ylr2HhTttjOmRed7n7PrF2nOUsizCVfeG0QRi25d/uUI7/pNUAH 3Z9cjKnDiI+vuzGFN/Y3fLR5I08meqs7sNRXrXlXJtruFVIK8Ap89oJhs8/TRm9TeHBS vgomZX7k1GP9KYFxoGt93OdA3wKQZE0uoGZw0= Message-ID: <4A2CC6FA.6020904@gmail.com> Date: Mon, 08 Jun 2009 13:38:26 +0530 From: Pranith Kumar User-Agent: Thunderbird 2.0.0.0 (X11/20070326) MIME-Version: 1.0 To: greg@kroah.com CC: linux-kernel@vger.kernel.org Subject: Re: [TRIVIAL][PATCH 1/1] Fix warning in staging/otus/ioctl.c References: <4A2CBB99.9080908@gmail.com> In-Reply-To: <4A2CBB99.9080908@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5138 Lines: 143 Pranith Kumar wrote: > Hi, > > This patch fixes the following warning > > drivers/staging/otus/ioctl.c: In function `usbdrv_wpa_ioctl': > drivers/staging/otus/ioctl.c:2269: warning: ISO C90 forbids mixed > declarations and code > drivers/staging/otus/ioctl.c: In function `usbdrv_ioctl': > drivers/staging/otus/ioctl.c:2448: warning: ISO C90 forbids mixed > declarations and code Can you please supersede the above patch with this one?? This fixes a bunch of other warnings too. Thanks, Pranith. Signed-off-by: D Pranith Kumar diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c index ce04218..dd32705 100644 --- a/drivers/staging/otus/ioctl.c +++ b/drivers/staging/otus/ioctl.c @@ -2045,6 +2045,7 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm) struct zsKeyInfo keyInfo; struct usbdrv_private *macp = dev->ml_priv; u16_t vapId = 0; + int ii; /* zmw_get_wlan_dev(dev); */ @@ -2168,7 +2169,6 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm) /* DUMP key context */ /* #ifdef WPA_DEBUG */ if (keyInfo.keyLength > 0) { - int ii; printk(KERN_WARNING "Otus: Key Context:\n"); for (ii = 0; ii < keyInfo.keyLength; ) { @@ -2266,7 +2266,6 @@ 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); */ - int ii; u8_t len = zdparm->u.generic_elem.len; u8_t *wpaie = (u8_t *)zdparm->u.generic_elem.data; @@ -2401,7 +2400,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) struct athr_wlan_param zdparm; struct usbdrv_private *macp = dev->ml_priv; - int err = 0; + int err = 0, val = 0; int changed = 0; /* regp = macp->regp; */ @@ -2445,7 +2444,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) err = -EPERM; break; } - int val = *((int *) wrq->u.name); + val = *((int *) wrq->u.name); if ((val < 0) || (val > 2)) { err = -EINVAL; break; diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 591d1e2..40dc19a 100644 --- a/drivers/staging/rt2860/common/ba_action.c +++ b/drivers/staging/rt2860/common/ba_action.c @@ -1512,7 +1512,8 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet( RTPKT_TO_OSPKT(pRxPkt)->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); RTPKT_TO_OSPKT(pRxPkt)->data = pRxBlk->pData; RTPKT_TO_OSPKT(pRxPkt)->len = pRxBlk->DataSize; - RTPKT_TO_OSPKT(pRxPkt)->tail = RTPKT_TO_OSPKT(pRxPkt)->data + RTPKT_TO_OSPKT(pRxPkt)->len; + RTPKT_TO_OSPKT(pRxPkt)->tail = (UCHAR *) (RTPKT_TO_OSPKT(pRxPkt)->data + + RTPKT_TO_OSPKT(pRxPkt)->len); // // copy 802.3 header, if necessary diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index f3c128c..a44559b 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c @@ -607,7 +607,7 @@ PNDIS_PACKET ClonePacket( pClonedPkt->dev = pRxPkt->dev; pClonedPkt->data = pData; pClonedPkt->len = DataSize; - pClonedPkt->tail = pClonedPkt->data + pClonedPkt->len; + pClonedPkt->tail = (UCHAR *)(pClonedPkt->data + pClonedPkt->len); ASSERT(DataSize < 1530); } return pClonedPkt; @@ -629,7 +629,7 @@ void update_os_packet_info( pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); pOSPkt->data = pRxBlk->pData; pOSPkt->len = pRxBlk->DataSize; - pOSPkt->tail = pOSPkt->data + pOSPkt->len; + pOSPkt->tail = (UCHAR *) (pOSPkt->data + pOSPkt->len); } @@ -649,7 +649,7 @@ void wlan_802_11_to_802_3_packet( pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); pOSPkt->data = pRxBlk->pData; pOSPkt->len = pRxBlk->DataSize; - pOSPkt->tail = pOSPkt->data + pOSPkt->len; + pOSPkt->tail = (UCHAR *) (pOSPkt->data + pOSPkt->len); // // copy 802.3 header diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 6f5d0bf..c35d81e 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -1872,7 +1872,7 @@ static int slic_card_download(struct adapter *adapter) __iomem struct slic_regs *slic_regs = adapter->slic_regs; u32 instruction; u32 baseaddress; - u32 failure; + /* u32 failure; */ u32 i; u32 numsects = 0; u32 sectsize[3]; diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c index 076b3f7..30bbf76 100644 --- a/drivers/staging/sxg/sxg.c +++ b/drivers/staging/sxg/sxg.c @@ -2150,7 +2150,7 @@ void sxg_set_interrupt_aggregation(struct adapter_t *adapter) static int sxg_entry_open(struct net_device *dev) { struct adapter_t *adapter = (struct adapter_t *) netdev_priv(dev); - int status; + int status = STATUS_FAILURE; static int turn; int sxg_initial_rcv_data_buffers = SXG_INITIAL_RCV_DATA_BUFFERS; int i; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/