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;
From: Alex Elder <elder@linaro.org>
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>
In-Reply-To: <20240130192305.250915-1-elder@linaro.org>
References: <20240130192305.250915-1-elder@linaro.org>
Precedence: bulk
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 <elder@linaro.org>
---
 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