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

Commit 29935aeb authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

phylib: remove unused adjust_state() callback 



Remove adjust_state() callback from 'struct phy_device' since it seems to have
never been really used from the inception: phy_start_machine() has been always
called with 2nd argument equal to NULL.

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77051ed8

drivers/net/phy/mdio_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int mdio_bus_resume(struct device *dev) 


no_resume:

	if (phydev->attached_dev && phydev->adjust_link)

		phy_start_machine(phydev, NULL);

		phy_start_machine(phydev);



	return 0;

}
@@ -401,7 +401,7 @@ static int mdio_bus_restore(struct device *dev) 
	phydev->link = 0;

	phydev->state = PHY_UP;



	phy_start_machine(phydev, NULL);

	phy_start_machine(phydev);



	return 0;

}

drivers/net/phy/phy.c

+3 −14
Original line number Diff line number Diff line
@@ -406,21 +406,15 @@ EXPORT_SYMBOL(phy_start_aneg); 
/**

 * phy_start_machine - start PHY state machine tracking

 * @phydev: the phy_device struct

 * @handler: callback function for state change notifications

 *

 * Description: The PHY infrastructure can run a state machine

 *   which tracks whether the PHY is starting up, negotiating,

 *   etc.  This function starts the timer which tracks the state

 *   of the PHY.  If you want to be notified when the state changes,

 *   pass in the callback @handler, otherwise, pass NULL.  If you

 *   want to maintain your own state machine, do not call this

 *   function.

 *   of the PHY.  If you want to maintain your own state machine,

 *   do not call this function.

 */

void phy_start_machine(struct phy_device *phydev,

		       void (*handler)(struct net_device *))

void phy_start_machine(struct phy_device *phydev)

{

	phydev->adjust_state = handler;



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

}
@@ -440,8 +434,6 @@ void phy_stop_machine(struct phy_device *phydev) 
	if (phydev->state > PHY_UP)

		phydev->state = PHY_UP;

	mutex_unlock(&phydev->lock);



	phydev->adjust_state = NULL;

}



/**
@@ -706,9 +698,6 @@ void phy_state_machine(struct work_struct *work) 


	mutex_lock(&phydev->lock);



	if (phydev->adjust_state)

		phydev->adjust_state(phydev->attached_dev);



	switch (phydev->state) {

	case PHY_DOWN:

	case PHY_STARTING:

drivers/net/phy/phy_device.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ int phy_connect_direct(struct net_device *dev, struct phy_device *phydev, 
		return rc;



	phy_prepare_link(phydev, handler);

	phy_start_machine(phydev, NULL);

	phy_start_machine(phydev);

	if (phydev->irq > 0)

		phy_start_interrupts(phydev);

include/linux/phy.h

+1 −6
Original line number Diff line number Diff line
@@ -282,8 +282,6 @@ struct phy_c45_device_ids { 
 * attached_dev: The attached enet driver's device instance ptr

 * adjust_link: Callback for the enet controller to respond to

 * changes in the link state.

 * adjust_state: Callback for the enet driver to respond to

 * changes in the state machine.

 *

 * speed, duplex, pause, supported, advertising, lp_advertising,

 * and autoneg are used like in mii_if_info
@@ -364,8 +362,6 @@ struct phy_device { 
	struct net_device *attached_dev;



	void (*adjust_link)(struct net_device *dev);



	void (*adjust_state)(struct net_device *dev);

};

#define to_phy_device(d) container_of(d, struct phy_device, dev)
@@ -585,8 +581,7 @@ int phy_drivers_register(struct phy_driver *new_driver, int n); 
void phy_state_machine(struct work_struct *work);

void phy_change(struct work_struct *work);

void phy_mac_interrupt(struct phy_device *phydev, int new_link);

void phy_start_machine(struct phy_device *phydev,

		       void (*handler)(struct net_device *));

void phy_start_machine(struct phy_device *phydev);

void phy_stop_machine(struct phy_device *phydev);

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

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