From patchwork Thu Oct 24 09:54:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 11208763 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 AABB714E5 for ; Thu, 24 Oct 2019 09:54:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 83E3621E6F for ; Thu, 24 Oct 2019 09:54:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cCayBhU+"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="YbcmWlSO"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="YbcmWlSO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 83E3621E6F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=v3dgG8VcslsVu7eQlJTmtmwEouyomzps4vWR58NB8bc=; b=cCa yBhU+p6wbd9vsP9CW5lVgimVdCqwU9p/3bR2Dqkv6Od9ojtOd9mIebM5wff40jU5oiAA40dnS0+79 MPemnIcuVZ48ZrWDIHO41waH/jhaxgEKSKcPdx1lxr1yQzZDGZADUD5g+QFxAUyi1I17LyXDH0nz1 VzwlzHGLyEyUn3Foi7ecTG//1PI6FBS69Q6SydsqlROp+IJR+2Gqucdh9mf4n/GsHH5OlZTOe+zku QyhRffpM7ixyvw1MoHfBd/bEYvB82i1oRg3IaAw47o50vaN+4mZ/Q7wYoYKwkOa4Qf76Fti4BVtE8 qzYcGwgRS03xI7CBZ1QQ80Ij4W4gZEg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNZov-00044W-TH; Thu, 24 Oct 2019 09:54:17 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNZos-00042o-9n for ath10k@lists.infradead.org; Thu, 24 Oct 2019 09:54:16 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id C586F61196; Thu, 24 Oct 2019 09:54:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1571910853; bh=9Wf6RMnyINCUk3PS0SF0QPwLRWMMNoeboD9LOGpLDdM=; h=From:To:Cc:Subject:Date:From; b=YbcmWlSOb3aa9nilL0ojgIj17QZr4zXBLtKz0HzjlQlCBwkE1dxUeURnv2JhojK3w cK1y/qK3WdpWzLOTUAQB4AKLrUVsH1CI2wYRT1vg1xDW1GPenb0m2ng9A7wnox1/qu B9mhbznlqg1NE5DNDXfHLMf4BH96H3AP+SHpWDFU= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from potku.adurom.net (unknown [88.114.240.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kvalo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 907EB60FBB; Thu, 24 Oct 2019 09:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1571910853; bh=9Wf6RMnyINCUk3PS0SF0QPwLRWMMNoeboD9LOGpLDdM=; h=From:To:Cc:Subject:Date:From; b=YbcmWlSOb3aa9nilL0ojgIj17QZr4zXBLtKz0HzjlQlCBwkE1dxUeURnv2JhojK3w cK1y/qK3WdpWzLOTUAQB4AKLrUVsH1CI2wYRT1vg1xDW1GPenb0m2ng9A7wnox1/qu B9mhbznlqg1NE5DNDXfHLMf4BH96H3AP+SHpWDFU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 907EB60FBB Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kvalo@codeaurora.org From: Kalle Valo To: ath10k@lists.infradead.org Subject: [PATCH 1/2] ath10k: cosmetic cleanup to sdio files Date: Thu, 24 Oct 2019 12:54:08 +0300 Message-Id: <1571910849-11489-1-git-send-email-kvalo@codeaurora.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191024_025414_378890_C78B9213 X-CRM114-Status: GOOD ( 10.73 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.145.29.96 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org Do some cosmetic cleanup while reviewing the files. No functional changes. Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath10k/sdio.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c index c34637881219..ef16b45c18da 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.c +++ b/drivers/net/wireless/ath/ath10k/sdio.c @@ -541,10 +541,8 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar, int pkt_cnt = 0; if (n_lookaheads > ATH10K_SDIO_MAX_RX_MSGS) { - ath10k_warn(ar, - "the total number of pkgs to be fetched (%u) exceeds maximum %u\n", - n_lookaheads, - ATH10K_SDIO_MAX_RX_MSGS); + ath10k_warn(ar, "the total number of pkgs to be fetched (%u) exceeds maximum %u\n", + n_lookaheads, ATH10K_SDIO_MAX_RX_MSGS); ret = -ENOMEM; goto err; } @@ -553,10 +551,8 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar, htc_hdr = (struct ath10k_htc_hdr *)&lookaheads[i]; last_in_bundle = false; - if (le16_to_cpu(htc_hdr->len) > - ATH10K_HTC_MBOX_MAX_PAYLOAD_LENGTH) { - ath10k_warn(ar, - "payload length %d exceeds max htc length: %zu\n", + if (le16_to_cpu(htc_hdr->len) > ATH10K_HTC_MBOX_MAX_PAYLOAD_LENGTH) { + ath10k_warn(ar, "payload length %d exceeds max htc length: %zu\n", le16_to_cpu(htc_hdr->len), ATH10K_HTC_MBOX_MAX_PAYLOAD_LENGTH); ret = -ENOMEM; @@ -567,8 +563,7 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar, full_len = ath10k_sdio_calc_txrx_padded_len(ar_sdio, act_len); if (full_len > ATH10K_SDIO_MAX_BUFFER_SIZE) { - ath10k_warn(ar, - "rx buffer requested with invalid htc_hdr length (%d, 0x%x): %d\n", + ath10k_warn(ar, "rx buffer requested with invalid htc_hdr length (%d, 0x%x): %d\n", htc_hdr->eid, htc_hdr->flags, le16_to_cpu(htc_hdr->len)); ret = -EINVAL; @@ -590,12 +585,14 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar, &bndl_cnt); if (ret) { - ath10k_warn(ar, "alloc_bundle error %d\n", ret); + ath10k_warn(ar, "failed to allocate a bundle: %d\n", + ret); goto err; } pkt_cnt += bndl_cnt; - /*Next buffer will be the last in the bundle */ + + /* next buffer will be the last in the bundle */ last_in_bundle = true; } From patchwork Thu Oct 24 09:54:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 11208767 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 134F114E5 for ; Thu, 24 Oct 2019 09:54:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E44772166E for ; Thu, 24 Oct 2019 09:54:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="owiCLyCp"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="WhZQoLA8"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="JDfRl5BJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E44772166E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=mc002ardlEqvKrJMeV1vds/7a9mospU8f7Ai3dX5PL0=; b=owiCLyCpl1dyEyvPPN+dmWLlFq v1kW18c00UP4pR1vlIWB1G6TfJ/QrZHAWWOz6KGp/Nqyv8zNCGlgTPxnPKBk6hOifpZBNp15l8vvr R8onJMBlf+eixR61xZhwlUp2Nuq9Bc2zY+NgEQ03Sc95kKz6se1SgCfC556RxopCfI6rvnM6DMKX4 tzOgss4Dm9pzgJcU3oa42bXC4waOIU4QbUY/avYhfN+CAR4C8EdBpxmeSfFXybJteqi2Wo82ran29 D8lzkVwrghpts+3IkrKkRf9AoxfNJN8qh11dga5Ul40dZI1lnuD1dfP34CE2k36Yn9IOXBBc/SoRz clu1GmxA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNZox-00046b-GN; Thu, 24 Oct 2019 09:54:19 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNZou-00043j-7n for ath10k@lists.infradead.org; Thu, 24 Oct 2019 09:54:17 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E808260FBB; Thu, 24 Oct 2019 09:54:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1571910855; bh=olhz53eSWn8B+t4e5HJ9Ad44Ha9vyjbjoKXi42voITg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WhZQoLA8i0HpKEx1qRBVAPJPh2YR4fmSmTNe1J2OxpqCvsUAj1oQ8c4blEMNdqp1G Mz5/OZWBPhNqlP4uU+6Z608BIhGZVGak+iKjchffUBvQwmPVjSloyjC80ZdMSu2yfP h7Oxy2jaGZd+vi7gj6uxmWNXEAnZrcmRAY4rWyeY= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from potku.adurom.net (unknown [88.114.240.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kvalo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id DA49B61178; Thu, 24 Oct 2019 09:54:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1571910854; bh=olhz53eSWn8B+t4e5HJ9Ad44Ha9vyjbjoKXi42voITg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JDfRl5BJj4KZNxrJnHiASCIFw/vDi/ubsXk/J4p4/xAnlvMSWjnnaArjlh5zSm4jU 0xrnTH9DBW02+f7HzJVvR9yAkY8ReEY4BgApndjyKdZL6gS+Au1NVFV6N+g+eoaEng fcS4DV/XoFvxQtUQZ89jsEKNx9FYmzITTo7NR+dU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org DA49B61178 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kvalo@codeaurora.org From: Kalle Valo To: ath10k@lists.infradead.org Subject: [PATCH 2/2] ath10k: sdio: remove struct ath10k_sdio_rx_data::status Date: Thu, 24 Oct 2019 12:54:09 +0300 Message-Id: <1571910849-11489-2-git-send-email-kvalo@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571910849-11489-1-git-send-email-kvalo@codeaurora.org> References: <1571910849-11489-1-git-send-email-kvalo@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191024_025416_321148_488BD633 X-CRM114-Status: UNSURE ( 9.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.145.29.96 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org It seems to be unused. Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath10k/sdio.c | 2 -- drivers/net/wireless/ath/ath10k/sdio.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c index ef16b45c18da..ceeee465a73a 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.c +++ b/drivers/net/wireless/ath/ath10k/sdio.c @@ -649,7 +649,6 @@ static int ath10k_sdio_mbox_rx_fetch(struct ath10k *ar) htc_hdr = (struct ath10k_htc_hdr *)skb->data; pkt->act_len = le16_to_cpu(htc_hdr->len) + sizeof(*htc_hdr); - pkt->status = ret; skb_put(skb, pkt->act_len); return ret; @@ -687,7 +686,6 @@ static int ath10k_sdio_mbox_rx_fetch_bundle(struct ath10k *ar) pkt->act_len = le16_to_cpu(htc_hdr->len) + sizeof(*htc_hdr); skb_put_data(pkt->skb, htc_hdr, pkt->act_len); - pkt->status = 0; pkt_offset += pkt->alloc_len; } diff --git a/drivers/net/wireless/ath/ath10k/sdio.h b/drivers/net/wireless/ath/ath10k/sdio.h index 9acaf0229cf2..33195f49acab 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.h +++ b/drivers/net/wireless/ath/ath10k/sdio.h @@ -126,7 +126,6 @@ struct ath10k_sdio_rx_data { bool part_of_bundle; bool last_in_bundle; bool trailer_only; - int status; }; struct ath10k_sdio_irq_proc_regs {