Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f2959b6 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: improve handling delayed work 



Using mod_delayed_work() allows to simplify handling delayed work and
removes the need for the sync parameter in phy_trigger_machine().
Also introduce a helper phy_queue_state_machine() to encapsulate the
low-level delayed work calls. No functional change intended.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0651d8e

drivers/net/phy/phy.c

+15 −14
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static int phy_start_aneg_priv(struct phy_device *phydev, bool sync) 
	mutex_unlock(&phydev->lock);



	if (trigger)

		phy_trigger_machine(phydev, sync);

		phy_trigger_machine(phydev);



	return err;

}
@@ -635,6 +635,13 @@ int phy_speed_up(struct phy_device *phydev) 
}

EXPORT_SYMBOL_GPL(phy_speed_up);



static void phy_queue_state_machine(struct phy_device *phydev,

				    unsigned int secs)

{

	mod_delayed_work(system_power_efficient_wq, &phydev->state_queue,

			 secs * HZ);

}



/**

 * phy_start_machine - start PHY state machine tracking

 * @phydev: the phy_device struct
@@ -647,7 +654,7 @@ EXPORT_SYMBOL_GPL(phy_speed_up); 
 */

void phy_start_machine(struct phy_device *phydev)

{

	queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, HZ);

	phy_queue_state_machine(phydev, 1);

}

EXPORT_SYMBOL_GPL(phy_start_machine);
@@ -655,19 +662,14 @@ EXPORT_SYMBOL_GPL(phy_start_machine); 
 * phy_trigger_machine - trigger the state machine to run

 *

 * @phydev: the phy_device struct

 * @sync: indicate whether we should wait for the workqueue cancelation

 *

 * Description: There has been a change in state which requires that the

 *   state machine runs.

 */



void phy_trigger_machine(struct phy_device *phydev, bool sync)

void phy_trigger_machine(struct phy_device *phydev)

{

	if (sync)

		cancel_delayed_work_sync(&phydev->state_queue);

	else

		cancel_delayed_work(&phydev->state_queue);

	queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, 0);

	phy_queue_state_machine(phydev, 0);

}



/**
@@ -703,7 +705,7 @@ static void phy_error(struct phy_device *phydev) 
	phydev->state = PHY_HALTED;

	mutex_unlock(&phydev->lock);



	phy_trigger_machine(phydev, false);

	phy_trigger_machine(phydev);

}



/**
@@ -745,7 +747,7 @@ static irqreturn_t phy_change(struct phy_device *phydev) 
	mutex_unlock(&phydev->lock);



	/* reschedule state queue work to run as soon as possible */

	phy_trigger_machine(phydev, true);

	phy_trigger_machine(phydev);



	if (phy_interrupt_is_valid(phydev) && phy_clear_interrupt(phydev))

		goto phy_err;
@@ -911,7 +913,7 @@ void phy_start(struct phy_device *phydev) 
	}

	mutex_unlock(&phydev->lock);



	phy_trigger_machine(phydev, true);

	phy_trigger_machine(phydev);

}

EXPORT_SYMBOL(phy_start);
@@ -1130,8 +1132,7 @@ void phy_state_machine(struct work_struct *work) 
	 * called from phy_disconnect() synchronously.

	 */

	if (phy_polling_mode(phydev) && old_state != PHY_HALTED)

		queue_delayed_work(system_power_efficient_wq, &phydev->state_queue,

				   PHY_STATE_TIME * HZ);

		phy_queue_state_machine(phydev, PHY_STATE_TIME);

}



/**

include/linux/phy.h

+1 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ void phy_change_work(struct work_struct *work); 
void phy_mac_interrupt(struct phy_device *phydev);

void phy_start_machine(struct phy_device *phydev);

void phy_stop_machine(struct phy_device *phydev);

void phy_trigger_machine(struct phy_device *phydev, bool sync);

void phy_trigger_machine(struct phy_device *phydev);

int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);

void phy_ethtool_ksettings_get(struct phy_device *phydev,

			       struct ethtool_link_ksettings *cmd);