Russell suggested to remove the locking from phy_is_started() because the read is atomic anyway and actually the locking may be more misleading.
Showing the changes to include (1 of 2 files). Show all
Unified · Split
| @@ -674,26 +674,13 @@ phy_lookup_setting(int speed, int duplex, const unsigned long *mask, · 673 unmodified lines | ||
| 674 | 674 | size_t phy_speeds(unsigned int *speeds, size_t size, |
| 675 | 675 | unsigned long *mask); |
| 676 | 676 | |
| 677 | −static inline bool __phy_is_started(struct phy_device *phydev) | |
| 678 | −{ | |
| 679 | − WARN_ON(!mutex_is_locked(&phydev->lock)); | |
| 680 | − | |
| 681 | − return phydev->state >= PHY_UP; | |
| 682 | −} | |
| 683 | − | |
| 684 | 677 | /** |
| 685 | 678 | * phy_is_started - Convenience function to check whether PHY is started |
| 686 | 679 | * @phydev: The phy_device struct |
| 687 | 680 | */ |
| 688 | 681 | static inline bool phy_is_started(struct phy_device *phydev) |
| 689 | 682 | { |
| 690 | − bool started; | |
| 691 | − | |
| 692 | − mutex_lock(&phydev->lock); | |
| 693 | − started = __phy_is_started(phydev); | |
| 694 | − mutex_unlock(&phydev->lock); | |
| 695 | − | |
| 696 | − return started; | |
| 683 | + return phydev->state >= PHY_UP; | |
| 697 | 684 | } |
| 698 | 685 | |
| 699 | 686 | void phy_resolve_aneg_linkmode(struct phy_device *phydev); |