[PATCH net-next v3 1/3] rust: net: phy: drop unused read_mmd, write_mmd and match_phy_device
From: SeungJong Ha
Date: Tue Nov 17 2026 - 05:36:43 EST
No Rust PHY driver implements read_mmd, write_mmd or match_phy_device,
and none has since they were added. They would also get a `Device` that
assumes `phy_device->lock` is held, but read_mmd and write_mmd run under
the MDIO bus lock, and match_phy_device runs without any PHY lock.
Drop them until there is a user.
Signed-off-by: SeungJong Ha <engineer.jjhama@xxxxxxxxx>
---
rust/kernel/net/phy.rs | 83 --------------------------------------------------
1 file changed, 83 deletions(-)
diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs
index c4e7b1d6c6f4..4604a9c0a511 100644
--- a/rust/kernel/net/phy.rs
+++ b/rust/kernel/net/phy.rs
@@ -403,58 +403,6 @@ impl<T: Driver> Adapter<T> {
})
}
- /// # Safety
- ///
- /// `phydev` must be passed by the corresponding callback in `phy_driver`.
- unsafe extern "C" fn match_phy_device_callback(
- phydev: *mut bindings::phy_device,
- _phydrv: *const bindings::phy_driver,
- ) -> c_int {
- // SAFETY: This callback is called only in contexts
- // where we hold `phy_device->lock`, so the accessors on
- // `Device` are okay to call.
- let dev = unsafe { Device::from_raw(phydev) };
- T::match_phy_device(dev).into()
- }
-
- /// # Safety
- ///
- /// `phydev` must be passed by the corresponding callback in `phy_driver`.
- unsafe extern "C" fn read_mmd_callback(
- phydev: *mut bindings::phy_device,
- devnum: i32,
- regnum: u16,
- ) -> i32 {
- from_result(|| {
- // SAFETY: This callback is called only in contexts
- // where we hold `phy_device->lock`, so the accessors on
- // `Device` are okay to call.
- let dev = unsafe { Device::from_raw(phydev) };
- // CAST: the C side verifies devnum < 32.
- let ret = T::read_mmd(dev, devnum as u8, regnum)?;
- Ok(ret.into())
- })
- }
-
- /// # Safety
- ///
- /// `phydev` must be passed by the corresponding callback in `phy_driver`.
- unsafe extern "C" fn write_mmd_callback(
- phydev: *mut bindings::phy_device,
- devnum: i32,
- regnum: u16,
- val: u16,
- ) -> i32 {
- from_result(|| {
- // SAFETY: This callback is called only in contexts
- // where we hold `phy_device->lock`, so the accessors on
- // `Device` are okay to call.
- let dev = unsafe { Device::from_raw(phydev) };
- T::write_mmd(dev, devnum as u8, regnum, val)?;
- Ok(0)
- })
- }
-
/// # Safety
///
/// `phydev` must be passed by the corresponding callback in `phy_driver`.
@@ -511,11 +459,6 @@ pub const fn create_phy_driver<T: Driver>() -> DriverVTable {
} else {
None
},
- match_phy_device: if T::HAS_MATCH_PHY_DEVICE {
- Some(Adapter::<T>::match_phy_device_callback)
- } else {
- None
- },
suspend: if T::HAS_SUSPEND {
Some(Adapter::<T>::suspend_callback)
} else {
@@ -536,16 +479,6 @@ pub const fn create_phy_driver<T: Driver>() -> DriverVTable {
} else {
None
},
- read_mmd: if T::HAS_READ_MMD {
- Some(Adapter::<T>::read_mmd_callback)
- } else {
- None
- },
- write_mmd: if T::HAS_WRITE_MMD {
- Some(Adapter::<T>::write_mmd_callback)
- } else {
- None
- },
link_change_notify: if T::HAS_LINK_CHANGE_NOTIFY {
Some(Adapter::<T>::link_change_notify_callback)
} else {
@@ -588,12 +521,6 @@ fn get_features(_dev: &mut Device) -> Result {
build_error!(VTABLE_DEFAULT_ERROR)
}
- /// Returns true if this is a suitable driver for the given phydev.
- /// If not implemented, matching is based on [`Driver::PHY_DEVICE_ID`].
- fn match_phy_device(_dev: &Device) -> bool {
- false
- }
-
/// Configures the advertisement and resets auto-negotiation
/// if auto-negotiation is enabled.
fn config_aneg(_dev: &mut Device) -> Result {
@@ -615,16 +542,6 @@ fn resume(_dev: &mut Device) -> Result {
build_error!(VTABLE_DEFAULT_ERROR)
}
- /// Overrides the default MMD read function for reading a MMD register.
- fn read_mmd(_dev: &mut Device, _devnum: u8, _regnum: u16) -> Result<u16> {
- build_error!(VTABLE_DEFAULT_ERROR)
- }
-
- /// Overrides the default MMD write function for writing a MMD register.
- fn write_mmd(_dev: &mut Device, _devnum: u8, _regnum: u16, _val: u16) -> Result {
- build_error!(VTABLE_DEFAULT_ERROR)
- }
-
/// Callback for notification of link change.
fn link_change_notify(_dev: &mut Device) {}
}
--
2.54.0