From patchwork Sun Mar 3 17:24:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 10837141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6B03217E9 for ; Sun, 3 Mar 2019 17:26:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4ECB829F3F for ; Sun, 3 Mar 2019 17:26:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42F4629F48; Sun, 3 Mar 2019 17:26:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F1EAC29F3F for ; Sun, 3 Mar 2019 17:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=10L977YbasGaHjbIDcFWzobc8I2fpwV4CV4oW/1A5Kc=; b=ukQryT5QgWhAWd zul3APRWknAKiDqE6LBWVWBTtsXg3vW7IIWXiKEqMBONlooxUiojkATJXon9Ker3rJZJzUVzHsKSV 2C1zJw2uVNGqq3m7Avgi2d0ZVViOyv6AOUoTRd6xx7DRvPYCTmHXdFZs9649LRktreBlbzOj2GOkC p1JLvs0XeBIFHasHuSL1CW3JvB2pv5Z0fnZLs7U8+SytBTb03JGftJGY0FGANRtIDtfFFADNGo9HW UYLQO0FbOUMP8/PUD7C21uddu4yaaliqjyYlut0NRXeatGCx1SEGqFqTWJBX68qT0VdCt4lkWGFZA JwUvSJaG4sDK1sYMhm+A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h0UsW-0006VH-1p; Sun, 03 Mar 2019 17:26:20 +0000 Received: from cloudserver094114.home.pl ([79.96.170.134]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h0UsT-0006UJ-LC for ath10k@lists.infradead.org; Sun, 03 Mar 2019 17:26:19 +0000 Received: from 79.184.253.110.ipv4.supernova.orange.pl (79.184.253.110) (HELO aspire.rjw.lan) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.213) id 97e9ea3eed2ba731; Sun, 3 Mar 2019 18:26:09 +0100 From: "Rafael J. Wysocki" To: Kalle Valo Subject: [PATCH] ath10k: Drop WARN_ON()s that always trigger during system resume Date: Sun, 03 Mar 2019 18:24:33 +0100 Message-ID: <2884043.Jv1Mn93hE8@aspire.rjw.lan> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190303_092617_856721_BC1E76A7 X-CRM114-Status: UNSURE ( 5.17 ) X-CRM114-Notice: Please train this message. X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Todd Brandt , Srinivas Pandruvada , linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, Linux PM Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafael J. Wysocki ath10k_mac_vif_chan() always returns an error for the given vif during system-wide resume which reliably triggers two WARN_ON()s in ath10k_bss_info_changed() and they are not particularly useful in that code path, so drop them. Signed-off-by: Rafael J. Wysocki Reviewed-by: Brian Norris Tested-by: Brian Norris Tested-by: Claire Chang --- drivers/net/wireless/ath/ath10k/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-pm/drivers/net/wireless/ath/ath10k/mac.c =================================================================== --- linux-pm.orig/drivers/net/wireless/ath/ath10k/mac.c +++ linux-pm/drivers/net/wireless/ath/ath10k/mac.c @@ -5705,7 +5705,7 @@ static void ath10k_bss_info_changed(stru } if (changed & BSS_CHANGED_MCAST_RATE && - !WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def))) { + !ath10k_mac_vif_chan(arvif->vif, &def)) { band = def.chan->band; rateidx = vif->bss_conf.mcast_rate[band] - 1; @@ -5743,7 +5743,7 @@ static void ath10k_bss_info_changed(stru } if (changed & BSS_CHANGED_BASIC_RATES) { - if (WARN_ON(ath10k_mac_vif_chan(vif, &def))) { + if (ath10k_mac_vif_chan(vif, &def)) { mutex_unlock(&ar->conf_mutex); return; }