Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phy: rename hwtstamp callback to hwtstamp_set

PHY devices has hwtstamp callback which actually performs set operation.
Rename it to better reflect the action.

Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Link: https://patch.msgid.link/20251124181151.277256-2-vadim.fedorenko@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Vadim Fedorenko and committed by
Jakub Kicinski
6aac2aa2 c01a6e5b

+46 -43
+1 -1
drivers/net/ethernet/ti/netcp_ethss.c
··· 2657 2657 2658 2658 phy = gbe_intf->slave->phy; 2659 2659 if (phy_has_hwtstamp(phy)) 2660 - return phy->mii_ts->hwtstamp(phy->mii_ts, cfg, extack); 2660 + return phy->mii_ts->hwtstamp_set(phy->mii_ts, cfg, extack); 2661 2661 2662 2662 switch (cfg->tx_type) { 2663 2663 case HWTSTAMP_TX_OFF:
+4 -4
drivers/net/phy/bcm-phy-ptp.c
··· 780 780 kfree_skb(skb); 781 781 } 782 782 783 - static int bcm_ptp_hwtstamp(struct mii_timestamper *mii_ts, 784 - struct kernel_hwtstamp_config *cfg, 785 - struct netlink_ext_ack *extack) 783 + static int bcm_ptp_hwtstamp_set(struct mii_timestamper *mii_ts, 784 + struct kernel_hwtstamp_config *cfg, 785 + struct netlink_ext_ack *extack) 786 786 { 787 787 struct bcm_ptp_private *priv = mii2priv(mii_ts); 788 788 u16 mode, ctrl; ··· 898 898 899 899 priv->mii_ts.rxtstamp = bcm_ptp_rxtstamp; 900 900 priv->mii_ts.txtstamp = bcm_ptp_txtstamp; 901 - priv->mii_ts.hwtstamp = bcm_ptp_hwtstamp; 901 + priv->mii_ts.hwtstamp_set = bcm_ptp_hwtstamp_set; 902 902 priv->mii_ts.ts_info = bcm_ptp_ts_info; 903 903 904 904 priv->phydev->mii_ts = &priv->mii_ts;
+4 -4
drivers/net/phy/dp83640.c
··· 1176 1176 return IRQ_HANDLED; 1177 1177 } 1178 1178 1179 - static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, 1180 - struct kernel_hwtstamp_config *cfg, 1181 - struct netlink_ext_ack *extack) 1179 + static int dp83640_hwtstamp_set(struct mii_timestamper *mii_ts, 1180 + struct kernel_hwtstamp_config *cfg, 1181 + struct netlink_ext_ack *extack) 1182 1182 { 1183 1183 struct dp83640_private *dp83640 = 1184 1184 container_of(mii_ts, struct dp83640_private, mii_ts); ··· 1407 1407 dp83640->phydev = phydev; 1408 1408 dp83640->mii_ts.rxtstamp = dp83640_rxtstamp; 1409 1409 dp83640->mii_ts.txtstamp = dp83640_txtstamp; 1410 - dp83640->mii_ts.hwtstamp = dp83640_hwtstamp; 1410 + dp83640->mii_ts.hwtstamp_set = dp83640_hwtstamp_set; 1411 1411 dp83640->mii_ts.ts_info = dp83640_ts_info; 1412 1412 1413 1413 INIT_DELAYED_WORK(&dp83640->ts_work, rx_timestamp_work);
+8 -8
drivers/net/phy/micrel.c
··· 3147 3147 lanphy_read_page_reg(phydev, LAN8814_PAGE_PORT_REGS, PTP_TSU_INT_STS); 3148 3148 } 3149 3149 3150 - static int lan8814_hwtstamp(struct mii_timestamper *mii_ts, 3151 - struct kernel_hwtstamp_config *config, 3152 - struct netlink_ext_ack *extack) 3150 + static int lan8814_hwtstamp_set(struct mii_timestamper *mii_ts, 3151 + struct kernel_hwtstamp_config *config, 3152 + struct netlink_ext_ack *extack) 3153 3153 { 3154 3154 struct kszphy_ptp_priv *ptp_priv = 3155 3155 container_of(mii_ts, struct kszphy_ptp_priv, mii_ts); ··· 4389 4389 4390 4390 ptp_priv->mii_ts.rxtstamp = lan8814_rxtstamp; 4391 4391 ptp_priv->mii_ts.txtstamp = lan8814_txtstamp; 4392 - ptp_priv->mii_ts.hwtstamp = lan8814_hwtstamp; 4392 + ptp_priv->mii_ts.hwtstamp_set = lan8814_hwtstamp_set; 4393 4393 ptp_priv->mii_ts.ts_info = lan8814_ts_info; 4394 4394 4395 4395 phydev->mii_ts = &ptp_priv->mii_ts; ··· 5042 5042 #define LAN8841_PTP_TX_TIMESTAMP_EN 443 5043 5043 #define LAN8841_PTP_TX_MOD 445 5044 5044 5045 - static int lan8841_hwtstamp(struct mii_timestamper *mii_ts, 5046 - struct kernel_hwtstamp_config *config, 5047 - struct netlink_ext_ack *extack) 5045 + static int lan8841_hwtstamp_set(struct mii_timestamper *mii_ts, 5046 + struct kernel_hwtstamp_config *config, 5047 + struct netlink_ext_ack *extack) 5048 5048 { 5049 5049 struct kszphy_ptp_priv *ptp_priv = container_of(mii_ts, struct kszphy_ptp_priv, mii_ts); 5050 5050 struct phy_device *phydev = ptp_priv->phydev; ··· 5924 5924 5925 5925 ptp_priv->mii_ts.rxtstamp = lan8841_rxtstamp; 5926 5926 ptp_priv->mii_ts.txtstamp = lan8814_txtstamp; 5927 - ptp_priv->mii_ts.hwtstamp = lan8841_hwtstamp; 5927 + ptp_priv->mii_ts.hwtstamp_set = lan8841_hwtstamp_set; 5928 5928 ptp_priv->mii_ts.ts_info = lan8841_ts_info; 5929 5929 5930 5930 phydev->mii_ts = &ptp_priv->mii_ts;
+4 -4
drivers/net/phy/microchip_rds_ptp.c
··· 476 476 return true; 477 477 } 478 478 479 - static int mchp_rds_ptp_hwtstamp(struct mii_timestamper *mii_ts, 480 - struct kernel_hwtstamp_config *config, 481 - struct netlink_ext_ack *extack) 479 + static int mchp_rds_ptp_hwtstamp_set(struct mii_timestamper *mii_ts, 480 + struct kernel_hwtstamp_config *config, 481 + struct netlink_ext_ack *extack) 482 482 { 483 483 struct mchp_rds_ptp_clock *clock = 484 484 container_of(mii_ts, struct mchp_rds_ptp_clock, ··· 1281 1281 1282 1282 clock->mii_ts.rxtstamp = mchp_rds_ptp_rxtstamp; 1283 1283 clock->mii_ts.txtstamp = mchp_rds_ptp_txtstamp; 1284 - clock->mii_ts.hwtstamp = mchp_rds_ptp_hwtstamp; 1284 + clock->mii_ts.hwtstamp_set = mchp_rds_ptp_hwtstamp_set; 1285 1285 clock->mii_ts.ts_info = mchp_rds_ptp_ts_info; 1286 1286 1287 1287 phydev->mii_ts = &clock->mii_ts;
+4 -4
drivers/net/phy/mscc/mscc_ptp.c
··· 1051 1051 val); 1052 1052 } 1053 1053 1054 - static int vsc85xx_hwtstamp(struct mii_timestamper *mii_ts, 1055 - struct kernel_hwtstamp_config *cfg, 1056 - struct netlink_ext_ack *extack) 1054 + static int vsc85xx_hwtstamp_set(struct mii_timestamper *mii_ts, 1055 + struct kernel_hwtstamp_config *cfg, 1056 + struct netlink_ext_ack *extack) 1057 1057 { 1058 1058 struct vsc8531_private *vsc8531 = 1059 1059 container_of(mii_ts, struct vsc8531_private, mii_ts); ··· 1611 1611 1612 1612 vsc8531->mii_ts.rxtstamp = vsc85xx_rxtstamp; 1613 1613 vsc8531->mii_ts.txtstamp = vsc85xx_txtstamp; 1614 - vsc8531->mii_ts.hwtstamp = vsc85xx_hwtstamp; 1614 + vsc8531->mii_ts.hwtstamp_set = vsc85xx_hwtstamp_set; 1615 1615 vsc8531->mii_ts.ts_info = vsc85xx_ts_info; 1616 1616 phydev->mii_ts = &vsc8531->mii_ts; 1617 1617
+4 -4
drivers/net/phy/nxp-c45-tja11xx.c
··· 1012 1012 return true; 1013 1013 } 1014 1014 1015 - static int nxp_c45_hwtstamp(struct mii_timestamper *mii_ts, 1016 - struct kernel_hwtstamp_config *cfg, 1017 - struct netlink_ext_ack *extack) 1015 + static int nxp_c45_hwtstamp_set(struct mii_timestamper *mii_ts, 1016 + struct kernel_hwtstamp_config *cfg, 1017 + struct netlink_ext_ack *extack) 1018 1018 { 1019 1019 struct nxp_c45_phy *priv = container_of(mii_ts, struct nxp_c45_phy, 1020 1020 mii_ts); ··· 1749 1749 IS_ENABLED(CONFIG_NETWORK_PHY_TIMESTAMPING)) { 1750 1750 priv->mii_ts.rxtstamp = nxp_c45_rxtstamp; 1751 1751 priv->mii_ts.txtstamp = nxp_c45_txtstamp; 1752 - priv->mii_ts.hwtstamp = nxp_c45_hwtstamp; 1752 + priv->mii_ts.hwtstamp_set = nxp_c45_hwtstamp_set; 1753 1753 priv->mii_ts.ts_info = nxp_c45_ts_info; 1754 1754 phydev->mii_ts = &priv->mii_ts; 1755 1755 ret = nxp_c45_init_ptp_clock(priv);
+7 -4
drivers/net/phy/phy.c
··· 405 405 return 0; 406 406 407 407 case SIOCSHWTSTAMP: 408 - if (phydev->mii_ts && phydev->mii_ts->hwtstamp) { 408 + if (phydev->mii_ts && phydev->mii_ts->hwtstamp_set) { 409 409 if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg))) 410 410 return -EFAULT; 411 411 412 412 hwtstamp_config_to_kernel(&kernel_cfg, &cfg); 413 - ret = phydev->mii_ts->hwtstamp(phydev->mii_ts, &kernel_cfg, &extack); 413 + ret = phydev->mii_ts->hwtstamp_set(phydev->mii_ts, 414 + &kernel_cfg, 415 + &extack); 414 416 if (ret) 415 417 return ret; 416 418 ··· 495 493 if (!phydev) 496 494 return -ENODEV; 497 495 498 - if (phydev->mii_ts && phydev->mii_ts->hwtstamp) 499 - return phydev->mii_ts->hwtstamp(phydev->mii_ts, config, extack); 496 + if (phydev->mii_ts && phydev->mii_ts->hwtstamp_set) 497 + return phydev->mii_ts->hwtstamp_set(phydev->mii_ts, config, 498 + extack); 500 499 501 500 return -EOPNOTSUPP; 502 501 }
+4 -4
drivers/ptp/ptp_ines.c
··· 328 328 return ns; 329 329 } 330 330 331 - static int ines_hwtstamp(struct mii_timestamper *mii_ts, 332 - struct kernel_hwtstamp_config *cfg, 333 - struct netlink_ext_ack *extack) 331 + static int ines_hwtstamp_set(struct mii_timestamper *mii_ts, 332 + struct kernel_hwtstamp_config *cfg, 333 + struct netlink_ext_ack *extack) 334 334 { 335 335 struct ines_port *port = container_of(mii_ts, struct ines_port, mii_ts); 336 336 u32 cm_one_step = 0, port_conf, ts_stat_rx, ts_stat_tx; ··· 709 709 } 710 710 port->mii_ts.rxtstamp = ines_rxtstamp; 711 711 port->mii_ts.txtstamp = ines_txtstamp; 712 - port->mii_ts.hwtstamp = ines_hwtstamp; 712 + port->mii_ts.hwtstamp_set = ines_hwtstamp_set; 713 713 port->mii_ts.link_state = ines_link_state; 714 714 port->mii_ts.ts_info = ines_ts_info; 715 715
+4 -4
include/linux/mii_timestamper.h
··· 27 27 * as soon as a timestamp becomes available. One of the PTP_CLASS_ 28 28 * values is passed in 'type'. 29 29 * 30 - * @hwtstamp: Handles SIOCSHWTSTAMP ioctl for hardware time stamping. 30 + * @hwtstamp_set: Handles SIOCSHWTSTAMP ioctl for hardware time stamping. 31 31 * 32 32 * @link_state: Allows the device to respond to changes in the link 33 33 * state. The caller invokes this function while holding ··· 51 51 void (*txtstamp)(struct mii_timestamper *mii_ts, 52 52 struct sk_buff *skb, int type); 53 53 54 - int (*hwtstamp)(struct mii_timestamper *mii_ts, 55 - struct kernel_hwtstamp_config *kernel_config, 56 - struct netlink_ext_ack *extack); 54 + int (*hwtstamp_set)(struct mii_timestamper *mii_ts, 55 + struct kernel_hwtstamp_config *kernel_config, 56 + struct netlink_ext_ack *extack); 57 57 58 58 void (*link_state)(struct mii_timestamper *mii_ts, 59 59 struct phy_device *phydev);
+2 -2
include/linux/phy.h
··· 1915 1915 */ 1916 1916 static inline bool phy_has_hwtstamp(struct phy_device *phydev) 1917 1917 { 1918 - return phydev && phydev->mii_ts && phydev->mii_ts->hwtstamp; 1918 + return phydev && phydev->mii_ts && phydev->mii_ts->hwtstamp_set; 1919 1919 } 1920 1920 1921 1921 /** ··· 1950 1950 struct kernel_hwtstamp_config *cfg, 1951 1951 struct netlink_ext_ack *extack) 1952 1952 { 1953 - return phydev->mii_ts->hwtstamp(phydev->mii_ts, cfg, extack); 1953 + return phydev->mii_ts->hwtstamp_set(phydev->mii_ts, cfg, extack); 1954 1954 } 1955 1955 1956 1956 static inline bool phy_rxtstamp(struct phy_device *phydev, struct sk_buff *skb,