From patchwork Sat Jan 24 09:18:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hong Xu X-Patchwork-Id: 5698801 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 94C0AC058D for ; Sat, 24 Jan 2015 09:18:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 780A6202BE for ; Sat, 24 Jan 2015 09:18:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CD34202B8 for ; Sat, 24 Jan 2015 09:18:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751557AbbAXJSq (ORCPT ); Sat, 24 Jan 2015 04:18:46 -0500 Received: from mail-pd0-f182.google.com ([209.85.192.182]:41763 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750913AbbAXJSn (ORCPT ); Sat, 24 Jan 2015 04:18:43 -0500 Received: by mail-pd0-f182.google.com with SMTP id z10so2393376pdj.13 for ; Sat, 24 Jan 2015 01:18:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8d7KG7ksn1eOrnaOfjnpBeVfi2Qz9tchU1aP2YNFcPQ=; b=IkRIndw4hd1MhVHHKHgIzerQ4YZYRLBi8LvE/l/1fJbIZf0S4GPJ5E8EgTsxUFNBbv w84iWgVfRbnH8zxcSX7+2nz8Sz46v69XZeVidk6Y0ooFVrhhGN0M8z8tuHQMwOHqzaEw ORcYia8GUZmwZQOtd0mbA/lnK6YIB1jHeo1FkBdEAFv8jkSHmYYwuWuKnGCq4Z5CIJvX r0dmDvt6lAnDpb44RPEutAFKIIpAQgYEsXbpr3x1FXcwhK32+VLx8H2MmWcn6lrK6F6v irhMzdF99e3gUcoPXbFkIvYOLBROF5B9r8zGMVkseeMnD2u1PKcBmZ5OgWKAbbvGEK+d AnEg== X-Gm-Message-State: ALoCoQkXBIAbhed0psoJJpRPzEnXbDqKtDlo+X13jXwGzoi7c0wDgur2Sckk3HjGYh933/X/ih7M X-Received: by 10.70.95.166 with SMTP id dl6mr17991191pdb.140.1422091122468; Sat, 24 Jan 2015 01:18:42 -0800 (PST) Received: from localhost ([2605:e000:150f:c15c:4547:bdeb:95a5:3fd5]) by mx.google.com with ESMTPSA id ms4sm4139069pbc.92.2015.01.24.01.18.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Jan 2015 01:18:41 -0800 (PST) From: Hong Xu To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org, Hong Xu Subject: [PATCH v3] ath9k_htc: Add a module parameter to disable blink Date: Sat, 24 Jan 2015 01:18:23 -0800 Message-Id: <1422091103-10579-1-git-send-email-hong@topbug.net> X-Mailer: git-send-email 2.2.2 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Add an option "blink" to enable or disable the LED blink. The default value is set to 1 so that existing users would not experience any unexpected changes. Signed-off-by: Hong Xu --- drivers/net/wireless/ath/ath9k/htc.h | 3 +++ drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 4 ++++ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 9dde265..300d367 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -44,6 +44,9 @@ extern struct ieee80211_ops ath9k_htc_ops; extern int htc_modparam_nohwcrypt; +#ifdef CONFIG_MAC80211_LEDS +extern int ath9k_htc_led_blink; +#endif enum htc_phymode { HTC_MODE_11NA = 0, diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c index 50f74a2..2aabcbd 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c @@ -279,6 +279,10 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv) else priv->ah->led_pin = ATH_LED_PIN_DEF; + if (!ath9k_htc_led_blink) + priv->led_cdev.default_trigger = + ieee80211_get_radio_led_name(priv->hw); + ath9k_configure_leds(priv); snprintf(priv->led_name, sizeof(priv->led_name), diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index e8fa944..fd22940 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c @@ -39,6 +39,10 @@ module_param_named(ps_enable, ath9k_ps_enable, int, 0444); MODULE_PARM_DESC(ps_enable, "Enable WLAN PowerSave"); #ifdef CONFIG_MAC80211_LEDS +int ath9k_htc_led_blink = 1; +module_param_named(blink, ath9k_htc_led_blink, int, 0444); +MODULE_PARM_DESC(blink, "Enable LED blink on activity"); + static const struct ieee80211_tpt_blink ath9k_htc_tpt_blink[] = { { .throughput = 0 * 1024, .blink_time = 334 }, { .throughput = 1 * 1024, .blink_time = 260 },