Received: by 2002:a05:7412:d1aa:b0:fc:a2b0:25d7 with SMTP id ba42csp1222698rdb; Tue, 30 Jan 2024 11:27:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFLvQIegjCrXxmoazDkwm7oag49x1xt4cPkieTzBMC2irPs9c2fHkP2fnffy//98uAyJxJs X-Received: by 2002:a17:902:e78a:b0:1d9:8be:6bc4 with SMTP id cp10-20020a170902e78a00b001d908be6bc4mr2283717plb.101.1706642853862; Tue, 30 Jan 2024 11:27:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706642853; cv=pass; d=google.com; s=arc-20160816; b=xYYbFjh7wKYFPPQmDfWFRp2ubZ9VEs+Wwxk43OjrUK8OmihWr6rQVmzNgmKJaH4Nbi Tg3CXvsGlqeQoH2BVcRIe0TIuEgVu5EiPgpJg2KXzI/+ybrUevzAltpPtHDwUnmOIV7o LROOMRo5uwthFgm3/6NbHjCUQh+mOL6AZFKknT+AylGJ1shWC0ChFOr/IMfKGp8sAnYw ObqFlmoiJACB3mtndnOQFPgaSwEGPfA5Zxswf76H7tBLWKhBiu1uF+SnN2ufdE+UGqM9 AjJAHz4Ms53VHHSDyPNhqELNnpADlP+DS/dG5l+aRpDiZIOCllIfIJY/OgqPv5CwbTIQ NDYg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=gOhxvtNzhkLmYjC1tnizOtWKQi1p2qd3Rj843Voiz6E=; fh=WEvQ9cMmHkkJSK6Q8ZGjbpfXMQJ5B5p1wwp6f9RMQw0=; b=jwKJXCgTVL/3ThHWqjTQ4U3CEG6BlYvZbSc4Nfj55Q9mPOLANOLrd1svJTsK7Zv6dZ qAOi+ncWfy+/6KHemP5SP2uCUxQTY/IT8/qQiiJX+P4TvXMGJ/iaZOsNmau8cp88+7BJ IMNOSGGTv8BzTdAOJKbqPbtNO/S/qBy30U7dnY6aNO5iwgamZkkBeM5H3qOAaXlTOwX3 Mox6GEREouXKtNUHWXyooS78rYhDI7Kj6itY4p6MtKd7OR45IVHXBuCisK3qWmDlbl/j cnIJcSQtMSc0H/WCnHP/ipyhQWFcnNcadB2mj4WutZeZAqhkWl5qCGkXN19002NIgHn+ n8/Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E3cq155t; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-45184-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45184-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id z30-20020a056a001d9e00b006d61376e49csi8123126pfw.93.2024.01.30.11.27.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 11:27:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45184-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E3cq155t; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-45184-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45184-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 321BAB234D4 for ; Tue, 30 Jan 2024 19:25:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 94E1C78B68; Tue, 30 Jan 2024 19:23:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="E3cq155t" Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7C7171B4D for ; Tue, 30 Jan 2024 19:23:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706642596; cv=none; b=g9eEwMjtqDgA6x7SflVX44+G8gKvv0PY8alIWDjoJa6ZJPuugwuVYGbAtiknV+q1QLNY9iSin1lVRSRz33W2ldxEuDwY1ISMKqrhajLWhPQe8DI9vKHxFiXXbIpqWaRyBDO0vHFveP5/nYq7clRmZkE7sbkWBoNwydRpoFgHAd4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706642596; c=relaxed/simple; bh=jBO1cJLAzJvxydUlAaWg5DMbUYAHb2xvJeVHkg5712o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HXljD1WPeeek+47/6tOeRxgC3iNqFZDrxIvmjvLO9ahKMgCzQplb1LAqYnQReGDv++l4xiG83KmP9yPoQKS/3EknZLHKBywh0jbcaqwpK4E9FRQlBUIc1hpyFTDj1ewfVMVN2YVyLblL+QGZ7dAG4rfVah0maXtTmNbRny3SQuw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=E3cq155t; arc=none smtp.client-ip=209.85.166.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-io1-f52.google.com with SMTP id ca18e2360f4ac-7bfd527d443so143857339f.3 for ; Tue, 30 Jan 2024 11:23:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706642594; x=1707247394; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gOhxvtNzhkLmYjC1tnizOtWKQi1p2qd3Rj843Voiz6E=; b=E3cq155tGSp9HDJ4BhL+90QiqMfSGYpisq3g0id/AUpYfV1wsNWvEFHb2gMQ6QGGD/ QVnTRuAlVnvauJ3OW9RTxwIWCew2idoLcVd4zLhW5S7kn4I6cN0Csjes/PZLXYqEOi6/ rtCiHIF94MiA/Not3W+saLFvMckQepncBr+1rjUp/G45yMEDMy9FrSbEQ0lIYxdbxrPF CVGphRGS1LW+KKN3I4YeenvdZMUV9JUux10KKwShFku/D9WmfveqOD6n4seEhXzwm+df YE7sr3Qi2fH8oWTZdXVG5XeIikFxy0AOrkNfxPbFJUgBjf1/coV/shCVS41Qa7aczWZF 4hhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706642594; x=1707247394; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gOhxvtNzhkLmYjC1tnizOtWKQi1p2qd3Rj843Voiz6E=; b=WjEHw61zMaFYi0gV6CvRVrS9p50h37RKG8qND+NWyKfFBat7Af3jHRxlCLwlfs2gJA bRNLnwXp2i5wb+Do95NcMsmQt0G1/fS5Q2eqTSElD9fU8aSwmhTViln20BQaH7JVedNM a9ZNCwHf4sPS1L8EX7IbZ0lEpl1+7SYXpkCb7Z2KukzF0+63fI+39a/dG5b1kRYTWYDb WnSD4ARcU9lr0IUPodK6Tz+IqBFF5a0KhR5SbhhbTBueIFdk+F0G6dFJjstvThXoxDXI DDDFy5DXl4Je+8glZzZ/gudAZjI9MCKjqeAc2bdynYf5ggFumo4CmKQ0EU8C29pReWcf jFfQ== X-Gm-Message-State: AOJu0YwgI6hZWtTutmsRX2ENdX8Bw5yd9dgRpRMa4Tj4jz1QKsyQoueH hV57guozBM5HoGjMSJxRkoWpHaUN8GtyhsbWL9Maplh/4L0x9Hq2lXYLXYpbz50= X-Received: by 2002:a05:6e02:1c03:b0:363:8727:ddd1 with SMTP id l3-20020a056e021c0300b003638727ddd1mr5281023ilh.13.1706642593982; Tue, 30 Jan 2024 11:23:13 -0800 (PST) Received: from localhost.localdomain (c-98-61-227-136.hsd1.mn.comcast.net. [98.61.227.136]) by smtp.gmail.com with ESMTPSA id t18-20020a92c912000000b003637871ec98sm2157762ilp.27.2024.01.30.11.23.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 11:23:13 -0800 (PST) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 5/7] net: ipa: kill ipa_power_modem_queue_stop() Date: Tue, 30 Jan 2024 13:23:02 -0600 Message-Id: <20240130192305.250915-6-elder@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240130192305.250915-1-elder@linaro.org> References: <20240130192305.250915-1-elder@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit All ipa_power_modem_queue_stop() does now is call netif_stop_queue(). Just call netif_stop_queue() in the one place it's needed, and get rid of ipa_power_modem_queue_stop(). Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_modem.c | 2 +- drivers/net/ipa/ipa_power.c | 16 +++++----------- drivers/net/ipa/ipa_power.h | 6 ------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/drivers/net/ipa/ipa_modem.c b/drivers/net/ipa/ipa_modem.c index c7a0b167c4326..08e1202f12863 100644 --- a/drivers/net/ipa/ipa_modem.c +++ b/drivers/net/ipa/ipa_modem.c @@ -156,7 +156,7 @@ ipa_start_xmit(struct sk_buff *skb, struct net_device *netdev) * we restart queueing before transmitting the SKB. Otherwise * queueing will eventually be enabled after resume completes. */ - ipa_power_modem_queue_stop(ipa); + netif_stop_queue(netdev); dev = &ipa->pdev->dev; ret = pm_runtime_get(dev); diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c index e615473d23805..812359c7977da 100644 --- a/drivers/net/ipa/ipa_power.c +++ b/drivers/net/ipa/ipa_power.c @@ -227,7 +227,7 @@ void ipa_power_suspend_handler(struct ipa *ipa, enum ipa_irq_id irq_id) ipa_interrupt_suspend_clear_all(ipa->interrupt); } -/* The next few functions are used when stopping and starting the modem +/* The next two functions are used when stopping and starting the modem * network device transmit queue. * * Transmit can run concurrent with power resume. When transmitting, @@ -236,17 +236,11 @@ void ipa_power_suspend_handler(struct ipa *ipa, enum ipa_irq_id irq_id) * gets sent (or dropped). If power is not ACTIVE, it will eventually * be, and transmits stay disabled until after it is. * - * The first function stops the modem netdev transmit queue. The second - * function starts the transmit queue and is used in the power resume - * path after power has become ACTIVE. The third function also enables - * transmits again, and is used by ipa_start_xmit() once it knows power - * is active. + * The first function starts the transmit queue and is used in the power + * resume path after power has become ACTIVE. The second function also + * enables transmits again, and is used by ipa_start_xmit() once it + * knows power is active. */ -void ipa_power_modem_queue_stop(struct ipa *ipa) -{ - netif_stop_queue(ipa->modem_netdev); -} - void ipa_power_modem_queue_wake(struct ipa *ipa) { netif_wake_queue(ipa->modem_netdev); diff --git a/drivers/net/ipa/ipa_power.h b/drivers/net/ipa/ipa_power.h index 3a4c59ea1222b..f51653399a07d 100644 --- a/drivers/net/ipa/ipa_power.h +++ b/drivers/net/ipa/ipa_power.h @@ -23,12 +23,6 @@ extern const struct dev_pm_ops ipa_pm_ops; */ u32 ipa_core_clock_rate(struct ipa *ipa); -/** - * ipa_power_modem_queue_stop() - Possibly stop the modem netdev TX queue - * @ipa: IPA pointer - */ -void ipa_power_modem_queue_stop(struct ipa *ipa); - /** * ipa_power_modem_queue_wake() - Possibly wake the modem netdev TX queue * @ipa: IPA pointer -- 2.40.1