From patchwork Thu Apr 23 20:23:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 11506533 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B297912 for ; Thu, 23 Apr 2020 20:23:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 298AE20776 for ; Thu, 23 Apr 2020 20:23:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EUxa7tiE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725934AbgDWUXQ (ORCPT ); Thu, 23 Apr 2020 16:23:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbgDWUXP (ORCPT ); Thu, 23 Apr 2020 16:23:15 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81EE1C09B042 for ; Thu, 23 Apr 2020 13:23:15 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id j2so8181724wrs.9 for ; Thu, 23 Apr 2020 13:23:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=jfFavikcngjciVGJ7Twew2sobE5hFyfgssbR2ynXImo=; b=EUxa7tiEqkVab2WtfVJ2IvuF6zTCDaxYxLqVwgdc/U2jqCIiB5EZbzYMVEvAcu1CP7 JxyBamGHMo+I868/KU+NF23bx6AVW5d4/uYmV/7aD7laEUcrWb2k2Zq/pM9x3k6L6h7K ATGy8ru8BwvLtb1ssQ2h8zFF8UFZpqxJivHkhgNg93cFhqfMHZG2C8sQ/efRNl++dgC+ Xt9vbPB5+Pj6pGzV3EzRMSS5UOA3Rtfw1MthxCUo2K91GQQTFpSvSkPN+fuBQXxd5v/o 0qophOVfUdgvpvOsfbTk6gVbgX4CnWHyvkTG5g43ysBK7jaAXbLxrvYspBop4q0O0g4h 1g0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=jfFavikcngjciVGJ7Twew2sobE5hFyfgssbR2ynXImo=; b=XfjJNoqqkE/yloxoZdLY7xwLDgHJaSQ9iFtj/tswEdGxofC/S6zl56jVUGckKw0cVd Ac/VrfLX1jnzBWYoNWxDDb5IprLpSPW7xt91VVzI5fExAkxyKhC7PZAfSonJf2IF3YvY LfRA97Jc3AM2tgnmP4i9SNgnm1TcLoJxBhzJRth72TmNz8any6wX8/aNqLL0PQOYVTj4 etJ/is/DzaBkSHs4KDXIIZSKe2AjKLdvhQmxTF5BfNjT0MSBAHHVf01VlOaYbBmjs5a5 JAu9ApDudr18f0rj2UwAzV1vkH1zZzG6DVbVU/tt4SItIipGoSeNeeJtqjaztHuBwWvW lZ8A== X-Gm-Message-State: AGi0PuYzlL5qY187+a8VaB9KHGUcFb+zFAQNlMI3Pq9OIfeBKPwLZmeq Vc0FEvWx8qx/DpJ9HJuMYa8= X-Google-Smtp-Source: APiQypIf0WtQC5Wd9r0tqCZgzPsPnkFZxO8X5mB+hVrKYG3i2HbXBfl2KwLaB5XpnrI2RoRb278M/A== X-Received: by 2002:adf:ec09:: with SMTP id x9mr6853823wrn.364.1587673394035; Thu, 23 Apr 2020 13:23:14 -0700 (PDT) Received: from [192.168.43.18] (94.197.120.138.threembb.co.uk. [94.197.120.138]) by smtp.gmail.com with ESMTPSA id 60sm5540985wrr.7.2020.04.23.13.23.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Apr 2020 13:23:13 -0700 (PDT) To: Greg Kroah-Hartman Cc: "devel@driverdev.osuosl.org" , linux-wireless@vger.kernel.org, Oscar Carter From: Malcolm Priestley Subject: [PATCH] staging: vt6656: rxtx: remove duration_id and void returns. Message-ID: <7e44c528-2a3a-6a3d-0b47-0307d27a1c8b@gmail.com> Date: Thu, 23 Apr 2020 21:23:11 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 Content-Language: en-US Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org duration_id is not used by driver anymore so remove the returns and set all functions in path to void. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6656/rxtx.c | 78 ++++++++++++++++------------------- 1 file changed, 36 insertions(+), 42 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 335ef4fd104f..7e15534e52ff 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -327,8 +327,8 @@ static u16 vnt_mac_hdr_pos(struct vnt_usb_send_context *tx_context, return (u16)(hdr_pos - head); } -static u16 vnt_rxtx_datahead_g(struct vnt_usb_send_context *tx_context, - struct vnt_tx_datahead_g *buf) +static void vnt_rxtx_datahead_g(struct vnt_usb_send_context *tx_context, + struct vnt_tx_datahead_g *buf) { struct vnt_private *priv = tx_context->priv; struct ieee80211_hdr *hdr = @@ -349,12 +349,10 @@ static u16 vnt_rxtx_datahead_g(struct vnt_usb_send_context *tx_context, priv->top_cck_basic_rate); tx_context->tx_hdr_size = vnt_mac_hdr_pos(tx_context, &buf->hdr); - - return le16_to_cpu(buf->duration_a); } -static u16 vnt_rxtx_datahead_ab(struct vnt_usb_send_context *tx_context, - struct vnt_tx_datahead_ab *buf) +static void vnt_rxtx_datahead_ab(struct vnt_usb_send_context *tx_context, + struct vnt_tx_datahead_ab *buf) { struct vnt_private *priv = tx_context->priv; struct ieee80211_hdr *hdr = @@ -371,12 +369,10 @@ static u16 vnt_rxtx_datahead_ab(struct vnt_usb_send_context *tx_context, buf->time_stamp_off = vnt_time_stamp_off(priv, rate); tx_context->tx_hdr_size = vnt_mac_hdr_pos(tx_context, &buf->hdr); - - return le16_to_cpu(buf->duration); } -static int vnt_fill_ieee80211_rts(struct vnt_usb_send_context *tx_context, - struct ieee80211_rts *rts, __le16 duration) +static void vnt_fill_ieee80211_rts(struct vnt_usb_send_context *tx_context, + struct ieee80211_rts *rts, __le16 duration) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx_context->skb->data; @@ -387,12 +383,10 @@ static int vnt_fill_ieee80211_rts(struct vnt_usb_send_context *tx_context, ether_addr_copy(rts->ra, hdr->addr1); ether_addr_copy(rts->ta, hdr->addr2); - - return 0; } -static u16 vnt_rxtx_rts_g_head(struct vnt_usb_send_context *tx_context, - struct vnt_rts_g *buf) +static void vnt_rxtx_rts_g_head(struct vnt_usb_send_context *tx_context, + struct vnt_rts_g *buf) { struct vnt_private *priv = tx_context->priv; u16 rts_frame_len = 20; @@ -415,11 +409,11 @@ static u16 vnt_rxtx_rts_g_head(struct vnt_usb_send_context *tx_context, vnt_fill_ieee80211_rts(tx_context, &buf->data, buf->duration_aa); - return vnt_rxtx_datahead_g(tx_context, &buf->data_head); + vnt_rxtx_datahead_g(tx_context, &buf->data_head); } -static u16 vnt_rxtx_rts_ab_head(struct vnt_usb_send_context *tx_context, - struct vnt_rts_ab *buf) +static void vnt_rxtx_rts_ab_head(struct vnt_usb_send_context *tx_context, + struct vnt_rts_ab *buf) { struct vnt_private *priv = tx_context->priv; u16 current_rate = tx_context->tx_rate; @@ -434,11 +428,11 @@ static u16 vnt_rxtx_rts_ab_head(struct vnt_usb_send_context *tx_context, vnt_fill_ieee80211_rts(tx_context, &buf->data, buf->duration); - return vnt_rxtx_datahead_ab(tx_context, &buf->data_head); + vnt_rxtx_datahead_ab(tx_context, &buf->data_head); } -static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, - union vnt_tx_data_head *head) +static void vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, + union vnt_tx_data_head *head) { struct vnt_private *priv = tx_context->priv; struct vnt_cts *buf = &head->cts_g; @@ -460,11 +454,11 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, ether_addr_copy(buf->data.ra, priv->current_net_addr); - return vnt_rxtx_datahead_g(tx_context, &buf->data_head); + vnt_rxtx_datahead_g(tx_context, &buf->data_head); } -static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context, - union vnt_tx_head *tx_head, bool need_mic) +static void vnt_rxtx_rts(struct vnt_usb_send_context *tx_context, + union vnt_tx_head *tx_head, bool need_mic) { struct vnt_private *priv = tx_context->priv; struct vnt_rrv_time_rts *buf = &tx_head->tx_rts.rts; @@ -489,11 +483,11 @@ static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context, if (need_mic) head = &tx_head->tx_rts.tx.mic.head; - return vnt_rxtx_rts_g_head(tx_context, &head->rts_g); + vnt_rxtx_rts_g_head(tx_context, &head->rts_g); } -static u16 vnt_rxtx_cts(struct vnt_usb_send_context *tx_context, - union vnt_tx_head *tx_head, bool need_mic) +static void vnt_rxtx_cts(struct vnt_usb_send_context *tx_context, + union vnt_tx_head *tx_head, bool need_mic) { struct vnt_private *priv = tx_context->priv; struct vnt_rrv_time_cts *buf = &tx_head->tx_cts.cts; @@ -513,11 +507,12 @@ static u16 vnt_rxtx_cts(struct vnt_usb_send_context *tx_context, if (need_mic) head = &tx_head->tx_cts.tx.mic.head; - return vnt_fill_cts_head(tx_context, head); + vnt_fill_cts_head(tx_context, head); } -static u16 vnt_rxtx_ab(struct vnt_usb_send_context *tx_context, - union vnt_tx_head *tx_head, bool need_rts, bool need_mic) +static void vnt_rxtx_ab(struct vnt_usb_send_context *tx_context, + union vnt_tx_head *tx_head, + bool need_rts, bool need_mic) { struct vnt_private *priv = tx_context->priv; struct vnt_rrv_time_ab *buf = &tx_head->tx_ab.ab; @@ -540,16 +535,16 @@ static u16 vnt_rxtx_ab(struct vnt_usb_send_context *tx_context, buf->rts_rrv_time = vnt_get_rtscts_rsvtime_le(priv, 2, tx_context->pkt_type, frame_len, current_rate); - return vnt_rxtx_rts_ab_head(tx_context, &head->rts_ab); + vnt_rxtx_rts_ab_head(tx_context, &head->rts_ab); } - return vnt_rxtx_datahead_ab(tx_context, &head->data_head_ab); + vnt_rxtx_datahead_ab(tx_context, &head->data_head_ab); } -static u16 vnt_generate_tx_parameter(struct vnt_usb_send_context *tx_context, - struct vnt_tx_buffer *tx_buffer, - struct vnt_mic_hdr **mic_hdr, u32 need_mic, - bool need_rts) +static void vnt_generate_tx_parameter(struct vnt_usb_send_context *tx_context, + struct vnt_tx_buffer *tx_buffer, + struct vnt_mic_hdr **mic_hdr, + u32 need_mic, bool need_rts) { if (tx_context->pkt_type == PK_TYPE_11GB || tx_context->pkt_type == PK_TYPE_11GA) { @@ -558,20 +553,19 @@ static u16 vnt_generate_tx_parameter(struct vnt_usb_send_context *tx_context, *mic_hdr = &tx_buffer->tx_head.tx_rts.tx.mic.hdr; - return vnt_rxtx_rts(tx_context, &tx_buffer->tx_head, - need_mic); + vnt_rxtx_rts(tx_context, &tx_buffer->tx_head, need_mic); } if (need_mic) *mic_hdr = &tx_buffer->tx_head.tx_cts.tx.mic.hdr; - return vnt_rxtx_cts(tx_context, &tx_buffer->tx_head, need_mic); + vnt_rxtx_cts(tx_context, &tx_buffer->tx_head, need_mic); } if (need_mic) *mic_hdr = &tx_buffer->tx_head.tx_ab.tx.mic.hdr; - return vnt_rxtx_ab(tx_context, &tx_buffer->tx_head, need_rts, need_mic); + vnt_rxtx_ab(tx_context, &tx_buffer->tx_head, need_rts, need_mic); } static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context, @@ -658,7 +652,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) struct vnt_tx_fifo_head *tx_buffer_head; struct vnt_usb_send_context *tx_context; unsigned long flags; - u16 tx_bytes, tx_header_size, tx_body_size, duration_id; + u16 tx_bytes, tx_header_size, tx_body_size; u8 pkt_type; bool need_rts = false; bool need_mic = false; @@ -772,8 +766,8 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) tx_buffer_head->current_rate = cpu_to_le16(rate->hw_value); - duration_id = vnt_generate_tx_parameter(tx_context, tx_buffer, &mic_hdr, - need_mic, need_rts); + vnt_generate_tx_parameter(tx_context, tx_buffer, &mic_hdr, + need_mic, need_rts); tx_header_size = tx_context->tx_hdr_size; if (!tx_header_size) {