Now that all users have been removed we can remove genphy_config_init.
Unified · Split
| @@ -1885,57 +1885,6 @@ int genphy_soft_reset(struct phy_device *phydev) · 1884 unmodified lines | |||
| 1885 | } | 1885 | } |
| 1886 | EXPORT_SYMBOL(genphy_soft_reset); | 1886 | EXPORT_SYMBOL(genphy_soft_reset); |
| 1887 | 1887 | ||
| 1888 | int genphy_config_init(struct phy_device *phydev) | ||
| 1889 | { | ||
| 1890 | int val; | ||
| 1891 | __ETHTOOL_DECLARE_LINK_MODE_MASK(features) = { 0, }; | ||
| 1892 | |||
| 1893 | linkmode_set_bit_array(phy_basic_ports_array, | ||
| 1894 | ARRAY_SIZE(phy_basic_ports_array), | ||
| 1895 | features); | ||
| 1896 | linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, features); | ||
| 1897 | linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, features); | ||
| 1898 | |||
| 1899 | /* Do we support autonegotiation? */ | ||
| 1900 | val = phy_read(phydev, MII_BMSR); | ||
| 1901 | if (val < 0) | ||
| 1902 | return val; | ||
| 1903 | |||
| 1904 | if (val & BMSR_ANEGCAPABLE) | ||
| 1905 | linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, features); | ||
| 1906 | |||
| 1907 | if (val & BMSR_100FULL) | ||
| 1908 | linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, features); | ||
| 1909 | if (val & BMSR_100HALF) | ||
| 1910 | linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, features); | ||
| 1911 | if (val & BMSR_10FULL) | ||
| 1912 | linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, features); | ||
| 1913 | if (val & BMSR_10HALF) | ||
| 1914 | linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, features); | ||
| 1915 | |||
| 1916 | if (val & BMSR_ESTATEN) { | ||
| 1917 | val = phy_read(phydev, MII_ESTATUS); | ||
| 1918 | if (val < 0) | ||
| 1919 | return val; | ||
| 1920 | |||
| 1921 | if (val & ESTATUS_1000_TFULL) | ||
| 1922 | linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, | ||
| 1923 | features); | ||
| 1924 | if (val & ESTATUS_1000_THALF) | ||
| 1925 | linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, | ||
| 1926 | features); | ||
| 1927 | if (val & ESTATUS_1000_XFULL) | ||
| 1928 | linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT, | ||
| 1929 | features); | ||
| 1930 | } | ||
| 1931 | |||
| 1932 | linkmode_and(phydev->supported, phydev->supported, features); | ||
| 1933 | linkmode_and(phydev->advertising, phydev->advertising, features); | ||
| 1934 | |||
| 1935 | return 0; | ||
| 1936 | } | ||
| 1937 | EXPORT_SYMBOL(genphy_config_init); | ||
| 1938 | |||
| 1939 | /** | 1888 | /** |
| 1940 | * genphy_read_abilities - read PHY abilities from Clause 22 registers | 1889 | * genphy_read_abilities - read PHY abilities from Clause 22 registers |
| 1941 | * @phydev: target phy_device struct | 1890 | * @phydev: target phy_device struct |
| @@ -1069,7 +1069,6 @@ void phy_attached_print(struct phy_device *phydev, const char *fmt, ...) · 1068 unmodified lines | |||
| 1069 | void phy_attached_info(struct phy_device *phydev); | 1069 | void phy_attached_info(struct phy_device *phydev); |
| 1070 | 1070 | ||
| 1071 | /* Clause 22 PHY */ | 1071 | /* Clause 22 PHY */ |
| 1072 | int genphy_config_init(struct phy_device *phydev); | ||
| 1073 | int genphy_read_abilities(struct phy_device *phydev); | 1072 | int genphy_read_abilities(struct phy_device *phydev); |
| 1074 | int genphy_setup_forced(struct phy_device *phydev); | 1073 | int genphy_setup_forced(struct phy_device *phydev); |
| 1075 | int genphy_restart_aneg(struct phy_device *phydev); | 1074 | int genphy_restart_aneg(struct phy_device *phydev); |