From patchwork Wed Sep 7 18:10:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 1128242 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p87IBidu012561 for ; Wed, 7 Sep 2011 18:11:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755314Ab1IGSLp (ORCPT ); Wed, 7 Sep 2011 14:11:45 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:50559 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755132Ab1IGSLp (ORCPT ); Wed, 7 Sep 2011 14:11:45 -0400 Received: by eyx24 with SMTP id 24so5210512eyx.19 for ; Wed, 07 Sep 2011 11:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; bh=7txmjawmvJNnnhE2YV/NhqIDWhygmgRx38ZqPuQm2AY=; b=oLjO1GJrmvg0c+7D+pr84hGiCIlv7lhTwvHhnTeERQMERMC6fZkTQnOGKPVnhmx5mL b9fwLguB1aeZ1IC4rJo0ihaOiC28Vm7LC//Ouh/mYs5ZFUzN9yUr5oEwEDgclViSIljL 2Q7yl7TIaJPFaA7vY9pcYNhdryi44q1mfWjUc= Received: by 10.14.8.20 with SMTP id 20mr2474144eeq.204.1315419103831; Wed, 07 Sep 2011 11:11:43 -0700 (PDT) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id f1sm2174629eec.0.2011.09.07.11.11.41 (version=SSLv3 cipher=OTHER); Wed, 07 Sep 2011 11:11:43 -0700 (PDT) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 3/5] rt2x00: Remove incorrect led blink Date: Wed, 7 Sep 2011 20:10:45 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: users@rt2x00.serialmonkey.com, linux-wireless@vger.kernel.org References: <201109072010.04023.IvDoorn@gmail.com> <201109072010.25836.IvDoorn@gmail.com> In-Reply-To: <201109072010.25836.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201109072010.45905.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 07 Sep 2011 18:11:53 +0000 (UTC) From: Helmut Schaa rt2800 devices are not capable of configuring arbitrary LED on/off periods. The LED_CFG register fields ON_PERIOD and OFF_PERIOD are only used by the hw when the LED mode is set to "blink upon TX". Hence, remove the blink callback. This will result in software emulation for LED blinking. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn --- drivers/net/wireless/rt2x00/rt2800lib.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index ba626a9..877b1e7 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -897,28 +897,12 @@ static void rt2800_brightness_set(struct led_classdev *led_cdev, } } -static int rt2800_blink_set(struct led_classdev *led_cdev, - unsigned long *delay_on, unsigned long *delay_off) -{ - struct rt2x00_led *led = - container_of(led_cdev, struct rt2x00_led, led_dev); - u32 reg; - - rt2800_register_read(led->rt2x00dev, LED_CFG, ®); - rt2x00_set_field32(®, LED_CFG_ON_PERIOD, *delay_on); - rt2x00_set_field32(®, LED_CFG_OFF_PERIOD, *delay_off); - rt2800_register_write(led->rt2x00dev, LED_CFG, reg); - - return 0; -} - static void rt2800_init_led(struct rt2x00_dev *rt2x00dev, struct rt2x00_led *led, enum led_type type) { led->rt2x00dev = rt2x00dev; led->type = type; led->led_dev.brightness_set = rt2800_brightness_set; - led->led_dev.blink_set = rt2800_blink_set; led->flags = LED_INITIALIZED; } #endif /* CONFIG_RT2X00_LIB_LEDS */