Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp12884pxj; Wed, 16 Jun 2021 18:50:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWhba5rLHyetDCadoype5PW5MUihvqfYcyse2dCbnxXFJmlGkMhwE1/Yhhafryt6PNdIiB X-Received: by 2002:a02:666d:: with SMTP id l45mr2189408jaf.0.1623894632073; Wed, 16 Jun 2021 18:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623894632; cv=none; d=google.com; s=arc-20160816; b=K5zIh6pwgA5DgiNmSRhsVI9rF3M2TodyNQpqFX1iw9HfMqNaUjDcNeQDfeW1e0SPB+ sJ98nHJmLWFbqq7SeB2C7FVtmdPzBp+vrkBoMNFlbZ+pbdBylmxq/CCgduNh43Mfg0C9 SJQgqgiVqw9om3izB+N30WehbiJQ4vUhouOrCDxWww4KtHaRa3pgDkd1QucYy0VmkKwv UP/VcCq9b7KaWYEkXeiLDfABhQk4BFQH6sPJYkWYfIZT91TLa/4pANjIs91yonQuJ8gp Mir0IVuKQJN0bFCxiKYF66LL8XbuGb19HH3Po+Ao8ae3Ha2dHC3hg0wIyDEzoDr4BQfu Zwsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Vlbz3QGae5SouhPbV5KZoq1BrSll0q0saobYc/qg1WQ=; b=tXiyBLbuUm5gsvAjRbN4Cyfp+RYSAurDtbK4yS6rsSzcqLYjKVPjNEwmhEJOSYzYNp QVIZG+rTiJc0+O82rYCK6WDBIceC3V9dqUs80nZ2xp1ZAiigRsO6nZtkVuEBWx0m+zK7 CqffgD2SAA4CfWRajF06ssxloFh6YYy5GSuJxWZHf3ZrxroRLmQQ7GguRr73jIEy07Le vj+OctQTRTWN+vnuT/wLWXTLNALSuZ3ZcWgJU9gjuIbdrDppD6z4va9m51Ai4A7WUCTc +VKi4ET9ZmESresp5sZSj5qYiYumTVOsUu+eMtHeU3/RiSmQ8q9fV7Lj2DrjNT1yetdx ES3A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p11si4122472ioo.38.2021.06.16.18.49.52; Wed, 16 Jun 2021 18:50:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232733AbhFPTaS (ORCPT + 99 others); Wed, 16 Jun 2021 15:30:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232769AbhFPTaS (ORCPT ); Wed, 16 Jun 2021 15:30:18 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9540C061767 for ; Wed, 16 Jun 2021 12:28:11 -0700 (PDT) Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1ltbCq-007jnG-BU; Wed, 16 Jun 2021 21:28:08 +0200 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: Johannes Berg Subject: [PATCH] mac80211: don't open-code LED manipulations Date: Wed, 16 Jun 2021 21:28:05 +0200 Message-Id: <20210616212804.b19ba1c60353.I8ea1b4defd5e12fc20ef281291e602feeec336a6@changeid> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg We shouldn't open-code led_trigger_blink() or led_trigger_event(), use them instead of badly open-coding them. This also fixes the locking, led_trigger_blink() and led_trigger_event() now use read_lock_irqsave(). Signed-off-by: Johannes Berg --- net/mac80211/led.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/net/mac80211/led.c b/net/mac80211/led.c index b275c8853074..6de8d0ad5497 100644 --- a/net/mac80211/led.c +++ b/net/mac80211/led.c @@ -259,7 +259,6 @@ static void tpt_trig_timer(struct timer_list *t) { struct tpt_led_trigger *tpt_trig = from_timer(tpt_trig, t, timer); struct ieee80211_local *local = tpt_trig->local; - struct led_classdev *led_cdev; unsigned long on, off, tpt; int i; @@ -283,10 +282,7 @@ static void tpt_trig_timer(struct timer_list *t) } } - read_lock(&local->tpt_led.leddev_list_lock); - list_for_each_entry(led_cdev, &local->tpt_led.led_cdevs, trig_list) - led_blink_set(led_cdev, &on, &off); - read_unlock(&local->tpt_led.leddev_list_lock); + led_trigger_blink(&local->tpt_led, &on, &off); } const char * @@ -341,7 +337,6 @@ static void ieee80211_start_tpt_led_trig(struct ieee80211_local *local) static void ieee80211_stop_tpt_led_trig(struct ieee80211_local *local) { struct tpt_led_trigger *tpt_trig = local->tpt_led_trigger; - struct led_classdev *led_cdev; if (!tpt_trig->running) return; @@ -349,10 +344,7 @@ static void ieee80211_stop_tpt_led_trig(struct ieee80211_local *local) tpt_trig->running = false; del_timer_sync(&tpt_trig->timer); - read_lock(&local->tpt_led.leddev_list_lock); - list_for_each_entry(led_cdev, &local->tpt_led.led_cdevs, trig_list) - led_set_brightness(led_cdev, LED_OFF); - read_unlock(&local->tpt_led.leddev_list_lock); + led_trigger_event(&local->tpt_led, LED_OFF); } void ieee80211_mod_tpt_led_trig(struct ieee80211_local *local, -- 2.31.1