From patchwork Fri Oct 14 12:50:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sangwook X-Patchwork-Id: 4682 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D6E3E23DEE for ; Fri, 14 Oct 2011 12:52:59 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id A7217A187C7 for ; Fri, 14 Oct 2011 12:52:59 +0000 (UTC) Received: by ywm14 with SMTP id 14so1125607ywm.11 for ; Fri, 14 Oct 2011 05:52:59 -0700 (PDT) Received: by 10.223.77.69 with SMTP id f5mr3961407fak.3.1318596778827; Fri, 14 Oct 2011 05:52:58 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.24.41 with SMTP id r9cs14330laf; Fri, 14 Oct 2011 05:52:58 -0700 (PDT) Received: by 10.236.190.67 with SMTP id d43mr11301099yhn.78.1318596777841; Fri, 14 Oct 2011 05:52:57 -0700 (PDT) Received: from mail-yx0-f176.google.com (mail-yx0-f176.google.com [209.85.213.176]) by mx.google.com with ESMTPS id i36si1469882ann.187.2011.10.14.05.52.57 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Oct 2011 05:52:57 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.213.176 is neither permitted nor denied by best guess record for domain of sangwook.lee@linaro.org) client-ip=209.85.213.176; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.176 is neither permitted nor denied by best guess record for domain of sangwook.lee@linaro.org) smtp.mail=sangwook.lee@linaro.org Received: by yxk30 with SMTP id 30so1027316yxk.35 for ; Fri, 14 Oct 2011 05:52:57 -0700 (PDT) Received: by 10.223.17.91 with SMTP id r27mr3801279faa.20.1318596776219; Fri, 14 Oct 2011 05:52:56 -0700 (PDT) Received: from localhost.localdomain (host109-149-104-5.range109-149.btcentralplus.com. [109.149.104.5]) by mx.google.com with ESMTPS id f10sm3562601fac.14.2011.10.14.05.52.54 (version=SSLv3 cipher=OTHER); Fri, 14 Oct 2011 05:52:55 -0700 (PDT) From: Sangwook Lee To: kvalo@qca.qualcomm.com Cc: linux-wireless@vger.kernel.org, patches@linaro.org, Sangwook Lee Subject: [PATCH 2/5] ath6kl: Add SDIO polling function hook into SDIO init time Date: Fri, 14 Oct 2011 13:50:43 +0100 Message-Id: <1318596646-19495-3-git-send-email-sangwook.lee@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1318596646-19495-1-git-send-email-sangwook.lee@linaro.org> References: <1318596646-19495-1-git-send-email-sangwook.lee@linaro.org> Add SDIO polling function into SDIO related file Signed-off-by: Sangwook Lee --- drivers/net/wireless/ath/ath6kl/sdio.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c index f48af45..f3520d9 100644 --- a/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/drivers/net/wireless/ath/ath6kl/sdio.c @@ -447,6 +447,9 @@ static void ath6kl_sdio_irq_handler(struct sdio_func *func) int status; struct ath6kl_sdio *ar_sdio; + if (ath6kl_wd_poll_is_ture()) + return; + ath6kl_dbg(ATH6KL_DBG_SDIO, "irq\n"); ar_sdio = sdio_get_drvdata(func); @@ -858,6 +861,8 @@ static int ath6kl_sdio_probe(struct sdio_func *func, sdio_release_host(func); + ath6kl_wd_init(ar); + ret = ath6kl_core_init(ar); if (ret) { ath6kl_err("Failed to init ath6kl core\n"); @@ -891,6 +896,8 @@ static void ath6kl_sdio_remove(struct sdio_func *func) ath6kl_stop_txrx(ar_sdio->ar); cancel_work_sync(&ar_sdio->wr_async_work); + ath6kl_wd_cleanup(ar_sdio->ar); + ath6kl_unavail_ev(ar_sdio->ar); ath6kl_sdio_power_off(ar_sdio);