Skip to content

Commit fb5e760

Browse files
ffainellidavem330
authored andcommitted
net: phy: Remove stale comments referencing timer
Since commit a390d1f ("phylib: convert state_queue work to delayed_work"), the PHYLIB state machine was converted to use delayed workqueues, yet some functions were still referencing the PHY library timer in their comments, fix that and remove the now unused linux/timer.h include. Signed-off-by: Florian Fainelli <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 122323f commit fb5e760

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

drivers/net/phy/phy.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <linux/ethtool.h>
3131
#include <linux/phy.h>
3232
#include <linux/phy_led_triggers.h>
33-
#include <linux/timer.h>
3433
#include <linux/workqueue.h>
3534
#include <linux/mdio.h>
3635
#include <linux/io.h>
@@ -705,8 +704,8 @@ EXPORT_SYMBOL(phy_start_aneg);
705704
*
706705
* Description: The PHY infrastructure can run a state machine
707706
* which tracks whether the PHY is starting up, negotiating,
708-
* etc. This function starts the timer which tracks the state
709-
* of the PHY. If you want to maintain your own state machine,
707+
* etc. This function starts the delayed workqueue which tracks
708+
* the state of the PHY. If you want to maintain your own state machine,
710709
* do not call this function.
711710
*/
712711
void phy_start_machine(struct phy_device *phydev)
@@ -737,9 +736,9 @@ void phy_trigger_machine(struct phy_device *phydev, bool sync)
737736
* phy_stop_machine - stop the PHY state machine tracking
738737
* @phydev: target phy_device struct
739738
*
740-
* Description: Stops the state machine timer, sets the state to UP
741-
* (unless it wasn't up yet). This function must be called BEFORE
742-
* phy_detach.
739+
* Description: Stops the state machine delayed workqueue, sets the
740+
* state to UP (unless it wasn't up yet). This function must be
741+
* called BEFORE phy_detach.
743742
*/
744743
void phy_stop_machine(struct phy_device *phydev)
745744
{

0 commit comments

Comments
 (0)