diff options
| author | Alex Elder <elder@linaro.org> | 2024-01-30 13:23:04 -0600 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-02-01 20:50:36 -0800 |
| commit | e01bbdc9f8513395a8554aeeeef8f45dd26dfe15 (patch) | |
| tree | 81d6fe86f0f85c2e61b859acee10347763633341 | |
| parent | 2acf5fc8dabaf9a5b14a678cd039f974dc749768 (diff) | |
net: ipa: kill ipa_power_modem_queue_wake()
All ipa_power_modem_queue_wake() does is call netif_wake_queue()
on the modem netdev. There is no need to wrap that call in a
trivial function (and certainly not one defined in "ipa_power.c").
So get rid of ipa_power_modem_queue_wake(), and replace its one
caller with a direct call to netif_wake_queue(). Determine the
netdev pointer to use from the private TX endpoint's netdev pointer.
Signed-off-by: Alex Elder <elder@linaro.org>
Link: https://lore.kernel.org/r/20240130192305.250915-8-elder@linaro.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/ipa/ipa_modem.c | 2 | ||||
| -rw-r--r-- | drivers/net/ipa/ipa_power.c | 13 | ||||
| -rw-r--r-- | drivers/net/ipa/ipa_power.h | 6 |
3 files changed, 1 insertions, 20 deletions
diff --git a/drivers/net/ipa/ipa_modem.c b/drivers/net/ipa/ipa_modem.c index 0c298060468e..1d1be92fbebc 100644 --- a/drivers/net/ipa/ipa_modem.c +++ b/drivers/net/ipa/ipa_modem.c @@ -277,7 +277,7 @@ static void ipa_modem_wake_queue_work(struct work_struct *work) { struct ipa_priv *priv = container_of(work, struct ipa_priv, work); - ipa_power_modem_queue_wake(priv->ipa); + netif_wake_queue(priv->tx->netdev); } /** ipa_modem_resume() - resume callback for runtime_pm diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c index fd2abce043fa..128a816f6523 100644 --- a/drivers/net/ipa/ipa_power.c +++ b/drivers/net/ipa/ipa_power.c @@ -227,19 +227,6 @@ void ipa_power_suspend_handler(struct ipa *ipa, enum ipa_irq_id irq_id) ipa_interrupt_suspend_clear_all(ipa->interrupt); } -/* Transmit can run concurrent with power resume. When transmitting, - * we disable further transmits until we can determine whether power - * is ACTIVE. If it is, future transmits are re-enabled and the buffer - * gets sent (or dropped). If power is not ACTIVE, it will eventually - * be, and transmits stay disabled until after it is. This function - * starts the transmit queue and is used in the power resume path after - * power has become ACTIVE. - */ -void ipa_power_modem_queue_wake(struct ipa *ipa) -{ - netif_wake_queue(ipa->modem_netdev); -} - static int ipa_power_retention_init(struct ipa_power *power) { struct qmp *qmp = qmp_get(power->dev); diff --git a/drivers/net/ipa/ipa_power.h b/drivers/net/ipa/ipa_power.h index dcd36a6a718f..718aacf5e2b2 100644 --- a/drivers/net/ipa/ipa_power.h +++ b/drivers/net/ipa/ipa_power.h @@ -24,12 +24,6 @@ extern const struct dev_pm_ops ipa_pm_ops; u32 ipa_core_clock_rate(struct ipa *ipa); /** - * ipa_power_modem_queue_wake() - Possibly wake the modem netdev TX queue - * @ipa: IPA pointer - */ -void ipa_power_modem_queue_wake(struct ipa *ipa); - -/** * ipa_power_retention() - Control register retention on power collapse * @ipa: IPA pointer * @enable: Whether retention should be enabled or disabled |