Commit 30cdaea2 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski

net: ipa: kill ipa_power_modem_queue_stop()

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: default avatarAlex Elder <elder@linaro.org>
Link: https://lore.kernel.org/r/20240130192305.250915-6-elder@linaro.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 86c9a492
...@@ -156,7 +156,7 @@ ipa_start_xmit(struct sk_buff *skb, struct net_device *netdev) ...@@ -156,7 +156,7 @@ ipa_start_xmit(struct sk_buff *skb, struct net_device *netdev)
* we restart queueing before transmitting the SKB. Otherwise * we restart queueing before transmitting the SKB. Otherwise
* queueing will eventually be enabled after resume completes. * queueing will eventually be enabled after resume completes.
*/ */
ipa_power_modem_queue_stop(ipa); netif_stop_queue(netdev);
dev = &ipa->pdev->dev; dev = &ipa->pdev->dev;
ret = pm_runtime_get(dev); ret = pm_runtime_get(dev);
......
...@@ -227,7 +227,7 @@ void ipa_power_suspend_handler(struct ipa *ipa, enum ipa_irq_id irq_id) ...@@ -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); 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. * network device transmit queue.
* *
* Transmit can run concurrent with power resume. When transmitting, * 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) ...@@ -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 * gets sent (or dropped). If power is not ACTIVE, it will eventually
* be, and transmits stay disabled until after it is. * be, and transmits stay disabled until after it is.
* *
* The first function stops the modem netdev transmit queue. The second * The first function starts the transmit queue and is used in the power
* function starts the transmit queue and is used in the power resume * resume path after power has become ACTIVE. The second function also
* path after power has become ACTIVE. The third function also enables * enables transmits again, and is used by ipa_start_xmit() once it
* transmits again, and is used by ipa_start_xmit() once it knows power * knows power is active.
* 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) void ipa_power_modem_queue_wake(struct ipa *ipa)
{ {
netif_wake_queue(ipa->modem_netdev); netif_wake_queue(ipa->modem_netdev);
......
...@@ -23,12 +23,6 @@ extern const struct dev_pm_ops ipa_pm_ops; ...@@ -23,12 +23,6 @@ extern const struct dev_pm_ops ipa_pm_ops;
*/ */
u32 ipa_core_clock_rate(struct ipa *ipa); 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_power_modem_queue_wake() - Possibly wake the modem netdev TX queue
* @ipa: IPA pointer * @ipa: IPA pointer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment