Skip to content

Commit

Permalink
rust: phy: use VTABLE_DEFAULT_ERROR
Browse files Browse the repository at this point in the history
Since 6.8-rc1, using VTABLE_DEFAULT_ERROR for optional functions
(never called) in #[vtable] is the recommended way.

Note that no functional changes in this patch.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
Reviewed-by: Trevor Gross <tmgross@umich.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
fujita authored and davem330 committed Jan 27, 2024
1 parent 1d4046b commit 599b75a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions rust/kernel/net/phy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -580,12 +580,12 @@ pub trait Driver {

/// Issues a PHY software reset.
fn soft_reset(_dev: &mut Device) -> Result {
Err(code::ENOTSUPP)
kernel::build_error(VTABLE_DEFAULT_ERROR)
}

/// Probes the hardware to determine what abilities it has.
fn get_features(_dev: &mut Device) -> Result {
Err(code::ENOTSUPP)
kernel::build_error(VTABLE_DEFAULT_ERROR)
}

/// Returns true if this is a suitable driver for the given phydev.
Expand All @@ -597,32 +597,32 @@ pub trait Driver {
/// Configures the advertisement and resets auto-negotiation
/// if auto-negotiation is enabled.
fn config_aneg(_dev: &mut Device) -> Result {
Err(code::ENOTSUPP)
kernel::build_error(VTABLE_DEFAULT_ERROR)
}

/// Determines the negotiated speed and duplex.
fn read_status(_dev: &mut Device) -> Result<u16> {
Err(code::ENOTSUPP)
kernel::build_error(VTABLE_DEFAULT_ERROR)
}

/// Suspends the hardware, saving state if needed.
fn suspend(_dev: &mut Device) -> Result {
Err(code::ENOTSUPP)
kernel::build_error(VTABLE_DEFAULT_ERROR)
}

/// Resumes the hardware, restoring state if needed.
fn resume(_dev: &mut Device) -> Result {
Err(code::ENOTSUPP)
kernel::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> {
Err(code::ENOTSUPP)
kernel::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 {
Err(code::ENOTSUPP)
kernel::build_error(VTABLE_DEFAULT_ERROR)
}

/// Callback for notification of link change.
Expand Down

0 comments on commit 599b75a

Please sign in to comment.