Commit e01bbdc9 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

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: default avatarAlex Elder <elder@linaro.org>
Link: https://lore.kernel.org/r/20240130192305.250915-8-elder@linaro.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2acf5fc8

drivers/net/ipa/ipa_modem.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ipa/ipa_power.c

+0 −13
Original line number Diff line number Diff line
@@ -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);

drivers/net/ipa/ipa_power.h

+0 −6
Original line number Diff line number Diff line
@@ -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_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