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

net: phy: simplify phy_mac_interrupt and related functions 



When using phy_mac_interrupt() the irq number is set to
PHY_IGNORE_INTERRUPT, therefore phy_interrupt_is_valid() returns false.
As a result phy_change() effectively just calls phy_trigger_machine()
when called from phy_mac_interrupt() via phy_change_work(). So we can
call phy_trigger_machine() from phy_mac_interrupt() directly and
remove some now unneeded code.

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

drivers/net/phy/phy.c

+1 −13
Original line number Diff line number Diff line
@@ -750,18 +750,6 @@ phy_err: 
	return IRQ_NONE;

}



/**

 * phy_change_work - Scheduled by the phy_mac_interrupt to handle PHY changes

 * @work: work_struct that describes the work to be done

 */

void phy_change_work(struct work_struct *work)

{

	struct phy_device *phydev =

		container_of(work, struct phy_device, phy_queue);



	phy_change(phydev);

}



/**

 * phy_interrupt - PHY interrupt handler

 * @irq: interrupt line
@@ -1005,7 +993,7 @@ void phy_state_machine(struct work_struct *work) 
void phy_mac_interrupt(struct phy_device *phydev)

{

	/* Trigger a state machine change */

	queue_work(system_power_efficient_wq, &phydev->phy_queue);

	phy_trigger_machine(phydev);

}

EXPORT_SYMBOL(phy_mac_interrupt);

drivers/net/phy/phy_device.c

+0 −1
Original line number Diff line number Diff line
@@ -587,7 +587,6 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id, 


	mutex_init(&dev->lock);

	INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);

	INIT_WORK(&dev->phy_queue, phy_change_work);



	/* Request the appropriate module unconditionally; don't

	 * bother trying to do so only if it isn't already loaded,

include/linux/phy.h

+0 −3
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ struct phy_c45_device_ids { 
 * giving up on the current attempt at acquiring a link

 * irq: IRQ number of the PHY's interrupt (-1 if none)

 * phy_timer: The timer for handling the state machine

 * phy_queue: A work_queue for the phy_mac_interrupt

 * 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.
@@ -454,7 +453,6 @@ struct phy_device { 
	void *priv;



	/* Interrupt and Polling infrastructure */

	struct work_struct phy_queue;

	struct delayed_work state_queue;



	struct mutex lock;
@@ -1029,7 +1027,6 @@ int phy_driver_register(struct phy_driver *new_driver, struct module *owner); 
int phy_drivers_register(struct phy_driver *new_driver, int n,

			 struct module *owner);

void phy_state_machine(struct work_struct *work);

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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE