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: 9663467 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 0FA3460352 for ; Wed, 5 Apr 2017 09:17:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E475B284FE for ; Wed, 5 Apr 2017 09:17:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D690728477; Wed, 5 Apr 2017 09:17:41 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6205228477 for ; Wed, 5 Apr 2017 09:17:41 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:To:From:Subject:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rKarjYsPCieApeaNiwZv7VXPUD+oP2TDv1UJRY+1TTU=; b=bRYOfne953WhLt qu6A1cRAJvfqGS8HjRxZ6marb37v7zVVPJl1FO1nz0s5XMCECx+sVdp9xVMRo9l9VknS9Ez3FxwyQ JuiH++FAL10mlwyDltNaUe9bnKX08trDBKujOwxTwrb7KklGH2joo4vmGDrHJxexgZUOHM5CiN8Nl TiADbUCWXG6QEVworMAC1ymuwa3lVd1NtbWrafHQrmot57ZZUYEh/mjdnwaJdlirqAdzxGGH4IySG 1jBmocShLXbhEqesKUJJ+MLGG4BZuuN9bQrBUtCOPn+OVdQunfPA6V5Hept0AZDYiG7EAiyf6gNMM GeDv6lf1K4JerhghdJOQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cvh4H-0000oP-Vd; Wed, 05 Apr 2017 09:17:34 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvfKw-0007Sg-P8 for ath10k@bombadil.infradead.org; Wed, 05 Apr 2017 07:26:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-ID:Date:CC:To:From:Subject:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=A3ZE9u9MpnuMLiVUYXyQpRyMrGqQqH3C7MXT6Boa2bs=; b=yh3SYgp0Te2o9VwqmJy+NaxGus Bqp5amzREDzk++dypxKPGBSGtdpMRmvMvH7yGVtr8OGAMT/viSitj1vdK6fPQTVwprT9hhtouig7e obb9DgTXffs1c86wHCnvP497gB2JFYBg5q9i52wNlf+dutev/1hYw3JlbbHVO5lqLj1uZnSEuD812 Sczppc8xCkhEGI9yJquOHoTqamYtxYalV+tUPbivbUDVdCbdP33EPH+2KQSMo7O9VCtpcZH2Vj61g HGmYJ8QLpGJMlQ7h0xYXrPaPgNCPMuslzucs6CPyUKUo/5/o+qHjwHLdPx50omDbY6cR/crwQ424+ 23H+/NhQ==; Received: from wolverine02.qualcomm.com ([199.106.114.251]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvf2g-0000y1-CC for ath10k@lists.infradead.org; Wed, 05 Apr 2017 07:07:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1491376066; x=1522912066; h=subject:from:to:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DjoreLDLGEbYSd8yHh3DFtNez7KZXu4MhX7VytRQEzk=; b=cfIdAcPm6RDWIgPCdoaFfpAARJKv3NaEpf5Q3lm0iYwvfEJP1EHVhAuF uyVYKRZsGUw9NLiUGJTSc3h3e1KOeIUNB3woG9j8tLtD8Dq9oZPpabcZd l7/Nyk5qiU5uR0lButY0qGg+vdI+b93Wl1d787n4GeyucGhSdEb+OlGlt s=; X-IronPort-AV: E=Sophos;i="5.36,277,1486454400"; d="scan'208";a="371494110" Received: from unknown (HELO Ironmsg03-L.qualcomm.com) ([10.53.140.110]) by wolverine02.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: 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) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170405_030746_935822_1029948A X-CRM114-Status: GOOD ( 10.15 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.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;