From patchwork Wed Apr 5 07:07:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 9663115 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7ECA0602B8 for ; Wed, 5 Apr 2017 07:11:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F23428527 for ; Wed, 5 Apr 2017 07:11:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63EA628533; Wed, 5 Apr 2017 07:11:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DA4928527 for ; Wed, 5 Apr 2017 07:11:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752936AbdDEHLn (ORCPT ); Wed, 5 Apr 2017 03:11:43 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:46778 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298AbdDEHLm (ORCPT ); Wed, 5 Apr 2017 03:11:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1491376302; x=1522912302; h=subject:from:to:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DjoreLDLGEbYSd8yHh3DFtNez7KZXu4MhX7VytRQEzk=; b=DpB/1VuGYw+tDsBdxq2IwwOdTaPmIn3mNGHqFq4oGhgQFdH/FhMiJl7M ClO3HfgIcWIfuN7uIIw5XKRnnhYI4zDc8qJTr0VggYBi5K76TfBYNf8/B IUcW9isyw5d+ddGOwMJLlL3TSfjahZM83GLajYq/NIt7+4+jGPSb9pJgJ A=; X-IronPort-AV: E=Sophos;i="5.36,277,1486454400"; d="scan'208";a="276077783" Received: from unknown (HELO Ironmsg03-L.qualcomm.com) ([10.53.140.110]) by wolverine01.qualcomm.com with ESMTP; 05 Apr 2017 00:07:46 -0700 X-IronPort-AV: E=McAfee;i="5800,7501,8488"; a="1345450185" X-MGA-submission: =?us-ascii?q?MDEVFMzDCJh1z0xJhhuN6Q0CGvZN2oN+KgMCuj?= =?us-ascii?q?RlcdDSyqKZElCUTMaei2FI7sH1NYBDT5eLzYF2erxKVS1+3P5e4iZ3Xi?= =?us-ascii?q?T+0yAOPWsAQIVeQl811dMiXmxXNrxhDKMko+4Qy/fzKZbI6wy6mm6Anc?= =?us-ascii?q?w1?= Received: from nasanexm02g.na.qualcomm.com ([10.85.0.88]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 05 Apr 2017 00:07:46 -0700 Received: from euamsexm01a.eu.qualcomm.com (10.251.127.40) by nasanexm02g.na.qualcomm.com (10.85.0.88) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Wed, 5 Apr 2017 00:07:44 -0700 Received: from potku.adurom.net (10.80.80.8) by euamsexm01a.eu.qualcomm.com (10.251.127.40) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Wed, 5 Apr 2017 09:07:40 +0200 Subject: [PATCH 6/7] ath10k: convert __ath10k_sdio_write_async() to use ath10k_sdio_write() From: Kalle Valo To: CC: Date: Wed, 5 Apr 2017 10:07:36 +0300 Message-ID: <149137605651.4898.4712041956291103322.stgit@potku.adurom.net> In-Reply-To: <149137591893.4898.2318291094351440261.stgit@potku.adurom.net> References: <149137591893.4898.2318291094351440261.stgit@potku.adurom.net> User-Agent: StGit/0.17.1-17-ge4e0 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01C.na.qualcomm.com (10.85.0.83) To euamsexm01a.eu.qualcomm.com (10.251.127.40) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath10k/sdio.c | 9 +++++---- drivers/net/wireless/ath/ath10k/sdio.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c index 301355228cfa..8ea1629c7bae 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.c +++ b/drivers/net/wireless/ath/ath10k/sdio.c @@ -1304,9 +1304,11 @@ static void __ath10k_sdio_write_async(struct ath10k *ar, int ret; skb = req->skb; - ret = ath10k_sdio_read_write_sync(ar, req->address, - skb->data, skb->len, - req->request); + ret = ath10k_sdio_write(ar, req->address, skb->data, skb->len); + if (ret) + ath10k_warn(ar, "failed to write skb to 0x%x asynchronously: %d", + req->address, ret); + if (req->htc_msg) { ep = &ar->htc.endpoint[req->eid]; ath10k_htc_notify_tx_completion(ep, skb); @@ -1355,7 +1357,6 @@ static int ath10k_sdio_prep_async_req(struct ath10k *ar, u32 addr, } bus_req->skb = skb; - bus_req->request = HIF_WRITE; bus_req->eid = eid; bus_req->address = addr; bus_req->htc_msg = htc_msg; diff --git a/drivers/net/wireless/ath/ath10k/sdio.h b/drivers/net/wireless/ath/ath10k/sdio.h index d1e4f78ddaeb..1bce56447e53 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.h +++ b/drivers/net/wireless/ath/ath10k/sdio.h @@ -110,7 +110,7 @@ struct ath10k_sdio_bus_request { /* sdio address */ u32 address; - u32 request; + struct sk_buff *skb; enum ath10k_htc_ep_id eid; int status;