aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/phy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/phy/phy.c')
-rw-r--r--drivers/net/phy/phy.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 3af9fcf76c81..a443976d5dcf 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -394,7 +394,7 @@ out_unlock:
394EXPORT_SYMBOL(phy_start_aneg); 394EXPORT_SYMBOL(phy_start_aneg);
395 395
396 396
397static void phy_change(void *data); 397static void phy_change(struct work_struct *work);
398static void phy_timer(unsigned long data); 398static void phy_timer(unsigned long data);
399 399
400/* phy_start_machine: 400/* phy_start_machine:
@@ -549,7 +549,7 @@ int phy_start_interrupts(struct phy_device *phydev)
549{ 549{
550 int err = 0; 550 int err = 0;
551 551
552 INIT_WORK(&phydev->phy_queue, phy_change, phydev); 552 INIT_WORK(&phydev->phy_queue, phy_change);
553 553
554 if (request_irq(phydev->irq, phy_interrupt, 554 if (request_irq(phydev->irq, phy_interrupt,
555 IRQF_SHARED, 555 IRQF_SHARED,
@@ -585,10 +585,11 @@ EXPORT_SYMBOL(phy_stop_interrupts);
585 585
586 586
587/* Scheduled by the phy_interrupt/timer to handle PHY changes */ 587/* Scheduled by the phy_interrupt/timer to handle PHY changes */
588static void phy_change(void *data) 588static void phy_change(struct work_struct *work)
589{ 589{
590 int err; 590 int err;
591 struct phy_device *phydev = data; 591 struct phy_device *phydev =
592 container_of(work, struct phy_device, phy_queue);
592 593
593 err = phy_disable_interrupts(phydev); 594 err = phy_disable_interrupts(phydev);
594 595