From patchwork Tue Nov 26 19:06:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 3240691 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 67F1C9F3AE for ; Tue, 26 Nov 2013 19:06:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 323972012D for ; Tue, 26 Nov 2013 19:06:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 026A22012C for ; Tue, 26 Nov 2013 19:06:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757660Ab3KZTGm (ORCPT ); Tue, 26 Nov 2013 14:06:42 -0500 Received: from mail-we0-f181.google.com ([74.125.82.181]:43687 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754822Ab3KZTGl (ORCPT ); Tue, 26 Nov 2013 14:06:41 -0500 Received: by mail-we0-f181.google.com with SMTP id x55so5711018wes.40 for ; Tue, 26 Nov 2013 11:06:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:mime-version :content-transfer-encoding; bh=wgfSax9Q/hLwspxTsFowbc8sGbZzaTaTvirQ1TlOgoc=; b=0j4Xd6uj9Q1In1xiorN3Yf/7mHPxaP1y0NBRTud0Q/V4GPVptiJttFvvwUVli9Oyi7 LfZfqc3h8lFVVmb/1OTa3fH10hGkd/qOG+KQlnt435nCIx9Y9eLf9QNkqLQODn9miw1G bfvueYQ1guNAhtSp9sj1rjjvrO7mDhzubPyzDOWpNt9yZGFzeP9gJrIK2dHRS7lAT8kj xkSRK4ETeXDB77mctgaJ1nANjivLed97GdxUhsJSnh+wPtjmD90DrHq0/lIyIQdv1mpT YLtWY1sjvWpXfZKYrh4CQBrw+RoNjygNaDVGO0grVODFHHuEZWu8PO5aIGWFiKrWJLCz IGpA== X-Received: by 10.180.83.1 with SMTP id m1mr19631667wiy.9.1385492800275; Tue, 26 Nov 2013 11:06:40 -0800 (PST) Received: from [192.168.1.100] (92.41.96.220.threembb.co.uk. [92.41.96.220]) by mx.google.com with ESMTPSA id dj8sm63306603wid.2.2013.11.26.11.06.38 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 26 Nov 2013 11:06:39 -0800 (PST) Message-ID: <1385492795.6446.2.camel@canaries32-MCP7A> Subject: [PATCH 1/3] staging: vt6656: remove void pointer from s_vGetFreeContext From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org Date: Tue, 26 Nov 2013 19:06:35 +0000 X-Mailer: Evolution 3.8.5-2ubuntu1 Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace with struct vnt_usb_send_context. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6656/rxtx.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index cc23029..0e4b6fb 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -96,7 +96,8 @@ static const u16 wFB_Opt1[2][5] = { static void s_vSaveTxPktInfo(struct vnt_private *pDevice, u8 byPktNum, u8 *pbyDestAddr, u16 wPktLength, u16 wFIFOCtl); -static void *s_vGetFreeContext(struct vnt_private *pDevice); +static struct vnt_usb_send_context + *s_vGetFreeContext(struct vnt_private *pDevice); static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, u8 byPktType, u16 wCurrentRate, struct vnt_tx_buffer *tx_buffer, @@ -136,7 +137,8 @@ static u16 s_uGetRTSCTSDuration(struct vnt_private *pDevice, u8 byDurType, u32 cbFrameLength, u8 byPktType, u16 wRate, int bNeedAck, u8 byFBOption); -static void *s_vGetFreeContext(struct vnt_private *pDevice) +static struct vnt_usb_send_context + *s_vGetFreeContext(struct vnt_private *pDevice) { struct vnt_usb_send_context *pContext = NULL; struct vnt_usb_send_context *pReturnContext = NULL; @@ -158,7 +160,8 @@ static void *s_vGetFreeContext(struct vnt_private *pDevice) if ( ii == pDevice->cbTD ) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No Free Tx Context\n"); } - return (void *) pReturnContext; + + return pReturnContext; } static void s_vSaveTxPktInfo(struct vnt_private *pDevice, u8 byPktNum, @@ -1377,7 +1380,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, u32 cbMacHdLen; u16 wCurrentRate = RATE_1M; - pContext = (struct vnt_usb_send_context *)s_vGetFreeContext(pDevice); + pContext = s_vGetFreeContext(pDevice); if (NULL == pContext) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ManagementSend TX...NO CONTEXT!\n"); @@ -1635,7 +1638,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, struct vnt_usb_send_context *pContext; CMD_STATUS status; - pContext = (struct vnt_usb_send_context *)s_vGetFreeContext(pDevice); + pContext = s_vGetFreeContext(pDevice); if (NULL == pContext) { status = CMD_STATUS_RESOURCES; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ManagementSend TX...NO CONTEXT!\n"); @@ -1745,7 +1748,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) } p80211Header = (PUWLAN_80211HDR)skb->data; - pContext = (struct vnt_usb_send_context *)s_vGetFreeContext(pDevice); + pContext = s_vGetFreeContext(pDevice); if (NULL == pContext) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0 TX...NO CONTEXT!\n"); @@ -2166,7 +2169,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, } } - pContext = (struct vnt_usb_send_context *)s_vGetFreeContext(pDevice); + pContext = s_vGetFreeContext(pDevice); if (pContext == NULL) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG" pContext == NULL\n"); @@ -2491,7 +2494,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen, u32 status; u16 wKeepRate = pDevice->wCurrentRate; - pContext = (struct vnt_usb_send_context *)s_vGetFreeContext(pDevice); + pContext = s_vGetFreeContext(pDevice); if (NULL == pContext) { return false;