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.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 43c51734d6cb..4e6dcc1cc237 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -384,7 +384,6 @@ int phy_start_aneg(struct phy_device *phydev)
384 phy_sanitize_settings(phydev); 384 phy_sanitize_settings(phydev);
385 385
386 err = phydev->drv->config_aneg(phydev); 386 err = phydev->drv->config_aneg(phydev);
387
388 if (err < 0) 387 if (err < 0)
389 goto out_unlock; 388 goto out_unlock;
390 389
@@ -404,7 +403,6 @@ out_unlock:
404} 403}
405EXPORT_SYMBOL(phy_start_aneg); 404EXPORT_SYMBOL(phy_start_aneg);
406 405
407
408/** 406/**
409 * phy_start_machine - start PHY state machine tracking 407 * phy_start_machine - start PHY state machine tracking
410 * @phydev: the phy_device struct 408 * @phydev: the phy_device struct
@@ -514,13 +512,11 @@ static int phy_disable_interrupts(struct phy_device *phydev)
514 512
515 /* Disable PHY interrupts */ 513 /* Disable PHY interrupts */
516 err = phy_config_interrupt(phydev, PHY_INTERRUPT_DISABLED); 514 err = phy_config_interrupt(phydev, PHY_INTERRUPT_DISABLED);
517
518 if (err) 515 if (err)
519 goto phy_err; 516 goto phy_err;
520 517
521 /* Clear the interrupt */ 518 /* Clear the interrupt */
522 err = phy_clear_interrupt(phydev); 519 err = phy_clear_interrupt(phydev);
523
524 if (err) 520 if (err)
525 goto phy_err; 521 goto phy_err;
526 522
@@ -589,7 +585,6 @@ int phy_stop_interrupts(struct phy_device *phydev)
589} 585}
590EXPORT_SYMBOL(phy_stop_interrupts); 586EXPORT_SYMBOL(phy_stop_interrupts);
591 587
592
593/** 588/**
594 * phy_change - Scheduled by the phy_interrupt/timer to handle PHY changes 589 * phy_change - Scheduled by the phy_interrupt/timer to handle PHY changes
595 * @work: work_struct that describes the work to be done 590 * @work: work_struct that describes the work to be done
@@ -622,7 +617,6 @@ void phy_change(struct work_struct *work)
622 /* reschedule state queue work to run as soon as possible */ 617 /* reschedule state queue work to run as soon as possible */
623 cancel_delayed_work_sync(&phydev->state_queue); 618 cancel_delayed_work_sync(&phydev->state_queue);
624 queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, 0); 619 queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, 0);
625
626 return; 620 return;
627 621
628ignore: 622ignore:
@@ -668,7 +662,6 @@ out_unlock:
668} 662}
669EXPORT_SYMBOL(phy_stop); 663EXPORT_SYMBOL(phy_stop);
670 664
671
672/** 665/**
673 * phy_start - start or restart a PHY device 666 * phy_start - start or restart a PHY device
674 * @phydev: target phy_device struct 667 * @phydev: target phy_device struct
@@ -730,7 +723,6 @@ void phy_state_machine(struct work_struct *work)
730 break; 723 break;
731 case PHY_AN: 724 case PHY_AN:
732 err = phy_read_status(phydev); 725 err = phy_read_status(phydev);
733
734 if (err < 0) 726 if (err < 0)
735 break; 727 break;
736 728
@@ -762,7 +754,6 @@ void phy_state_machine(struct work_struct *work)
762 break; 754 break;
763 case PHY_NOLINK: 755 case PHY_NOLINK:
764 err = phy_read_status(phydev); 756 err = phy_read_status(phydev);
765
766 if (err) 757 if (err)
767 break; 758 break;
768 759
@@ -774,7 +765,6 @@ void phy_state_machine(struct work_struct *work)
774 break; 765 break;
775 case PHY_FORCING: 766 case PHY_FORCING:
776 err = genphy_update_link(phydev); 767 err = genphy_update_link(phydev);
777
778 if (err) 768 if (err)
779 break; 769 break;
780 770
@@ -797,7 +787,6 @@ void phy_state_machine(struct work_struct *work)
797 break; 787 break;
798 case PHY_CHANGELINK: 788 case PHY_CHANGELINK:
799 err = phy_read_status(phydev); 789 err = phy_read_status(phydev);
800
801 if (err) 790 if (err)
802 break; 791 break;
803 792
@@ -824,14 +813,11 @@ void phy_state_machine(struct work_struct *work)
824 } 813 }
825 break; 814 break;
826 case PHY_RESUMING: 815 case PHY_RESUMING:
827
828 err = phy_clear_interrupt(phydev); 816 err = phy_clear_interrupt(phydev);
829
830 if (err) 817 if (err)
831 break; 818 break;
832 819
833 err = phy_config_interrupt(phydev, PHY_INTERRUPT_ENABLED); 820 err = phy_config_interrupt(phydev, PHY_INTERRUPT_ENABLED);
834
835 if (err) 821 if (err)
836 break; 822 break;
837 823