From patchwork Mon Oct 12 12:57:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajkumar Manoharan X-Patchwork-Id: 7374871 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 499E99F1D5 for ; Mon, 12 Oct 2015 12:59:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A9832064B for ; Mon, 12 Oct 2015 12:59:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4ED62205F2 for ; Mon, 12 Oct 2015 12:59:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752489AbbJLM7J (ORCPT ); Mon, 12 Oct 2015 08:59:09 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:46901 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752486AbbJLM7I (ORCPT ); Mon, 12 Oct 2015 08:59:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1444654748; x=1476190748; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=dF0FpU/R1oQE53Gh9Ec7kSdx/7LSSn9hcgyiN6376wg=; b=dZqBLs53wBYePAJM3jlDbS1uQlmeqSFmkO52xhpQstRPI1iDKLKPgIiO 6tVTtgroAZydJv7R/XBbRtOBCo6FUsAWLiPaxtMEmvZRy0WsQDCVRMao/ W9I3niasoVzvidspmW3Avd1Z5/6ln36jDkxZF03oD4AsBNv95QZGofns8 E=; X-IronPort-AV: E=McAfee;i="5700,7163,7951"; a="143262718" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine01.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 12 Oct 2015 05:59:08 -0700 X-IronPort-AV: E=Sophos;i="5.17,672,1437462000"; d="scan'208";a="1016236014" Received: from nasanexm02a.na.qualcomm.com ([10.85.0.41]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 12 Oct 2015 05:59:07 -0700 Received: from aphydexm01b.ap.qualcomm.com (10.252.127.11) by nasanexm02a.na.qualcomm.com (10.85.0.41) with Microsoft SMTP Server (TLS) id 15.0.1076.9; Mon, 12 Oct 2015 05:58:58 -0700 Received: from qcmail1.qualcomm.com (10.80.80.8) by aphydexm01b.ap.qualcomm.com (10.252.127.11) with Microsoft SMTP Server (TLS) id 15.0.1076.9; Mon, 12 Oct 2015 18:28:50 +0530 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Mon, 12 Oct 2015 18:28:51 +0530 From: Rajkumar Manoharan To: CC: , Rajkumar Manoharan Subject: [PATCH v2 6/7] ath10k: remove unused dl_is_polled Date: Mon, 12 Oct 2015 18:27:05 +0530 Message-ID: <1444654626-3290-7-git-send-email-rmanohar@qti.qualcomm.com> X-Mailer: git-send-email 2.6.0 In-Reply-To: <1444654626-3290-1-git-send-email-rmanohar@qti.qualcomm.com> References: <1444654626-3290-1-git-send-email-rmanohar@qti.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01F.na.qualcomm.com (10.85.0.32) To aphydexm01b.ap.qualcomm.com (10.252.127.11) 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_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable 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 Since polling for received messages not supported, remove unused dl_is_polled. Reviewed-by: Michal Kazior Signed-off-by: Rajkumar Manoharan --- drivers/net/wireless/ath/ath10k/hif.h | 7 +++---- drivers/net/wireless/ath/ath10k/htc.c | 7 +++---- drivers/net/wireless/ath/ath10k/htc.h | 1 - drivers/net/wireless/ath/ath10k/pci.c | 11 +++-------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/hif.h b/drivers/net/wireless/ath/ath10k/hif.h index 6e826bb..633594c 100644 --- a/drivers/net/wireless/ath/ath10k/hif.h +++ b/drivers/net/wireless/ath/ath10k/hif.h @@ -59,7 +59,7 @@ struct ath10k_hif_ops { int (*map_service_to_pipe)(struct ath10k *ar, u16 service_id, u8 *ul_pipe, u8 *dl_pipe, - int *ul_is_polled, int *dl_is_polled); + int *ul_is_polled); void (*get_default_pipe)(struct ath10k *ar, u8 *ul_pipe, u8 *dl_pipe); @@ -133,12 +133,11 @@ static inline void ath10k_hif_stop(struct ath10k *ar) static inline int ath10k_hif_map_service_to_pipe(struct ath10k *ar, u16 service_id, u8 *ul_pipe, u8 *dl_pipe, - int *ul_is_polled, - int *dl_is_polled) + int *ul_is_polled) { return ar->hif.ops->map_service_to_pipe(ar, service_id, ul_pipe, dl_pipe, - ul_is_polled, dl_is_polled); + ul_is_polled); } static inline void ath10k_hif_get_default_pipe(struct ath10k *ar, diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c index 13d0119..20e0c48 100644 --- a/drivers/net/wireless/ath/ath10k/htc.c +++ b/drivers/net/wireless/ath/ath10k/htc.c @@ -759,8 +759,7 @@ setup: ep->service_id, &ep->ul_pipe_id, &ep->dl_pipe_id, - &ep->ul_is_polled, - &ep->dl_is_polled); + &ep->ul_is_polled); if (status) return status; @@ -770,8 +769,8 @@ setup: ep->dl_pipe_id, ep->eid); ath10k_dbg(ar, ATH10K_DBG_BOOT, - "boot htc ep %d ul polled %d dl polled %d\n", - ep->eid, ep->ul_is_polled, ep->dl_is_polled); + "boot htc ep %d ul polled %d\n", + ep->eid, ep->ul_is_polled); if (disable_credit_flow_ctrl && ep->tx_credit_flow_enabled) { ep->tx_credit_flow_enabled = false; diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h index aed3708..2ddd41e 100644 --- a/drivers/net/wireless/ath/ath10k/htc.h +++ b/drivers/net/wireless/ath/ath10k/htc.h @@ -313,7 +313,6 @@ struct ath10k_htc_ep { u8 ul_pipe_id; u8 dl_pipe_id; int ul_is_polled; /* call HIF to get tx completions */ - int dl_is_polled; /* call HIF to fetch rx (not implemented) */ u8 seq_no; /* for debugging */ int tx_credits; diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 447c4c6..a2b384b 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -1453,8 +1453,7 @@ static void ath10k_pci_kill_tasklet(struct ath10k *ar) static int ath10k_pci_hif_map_service_to_pipe(struct ath10k *ar, u16 service_id, u8 *ul_pipe, - u8 *dl_pipe, int *ul_is_polled, - int *dl_is_polled) + u8 *dl_pipe, int *ul_is_polled) { const struct service_to_pipe *entry; bool ul_set = false, dl_set = false; @@ -1462,9 +1461,6 @@ static int ath10k_pci_hif_map_service_to_pipe(struct ath10k *ar, ath10k_dbg(ar, ATH10K_DBG_PCI, "pci hif map service\n"); - /* polling for received messages not supported */ - *dl_is_polled = 0; - for (i = 0; i < ARRAY_SIZE(target_service_to_ce_map_wlan); i++) { entry = &target_service_to_ce_map_wlan[i]; @@ -1507,7 +1503,7 @@ static int ath10k_pci_hif_map_service_to_pipe(struct ath10k *ar, static void ath10k_pci_hif_get_default_pipe(struct ath10k *ar, u8 *ul_pipe, u8 *dl_pipe) { - int ul_is_polled, dl_is_polled; + int ul_is_polled; ath10k_dbg(ar, ATH10K_DBG_PCI, "pci hif get default pipe\n"); @@ -1515,8 +1511,7 @@ static void ath10k_pci_hif_get_default_pipe(struct ath10k *ar, ATH10K_HTC_SVC_ID_RSVD_CTRL, ul_pipe, dl_pipe, - &ul_is_polled, - &dl_is_polled); + &ul_is_polled); } static void ath10k_pci_irq_msi_fw_mask(struct ath10k *ar)