6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Asahi Lina <lina@xxxxxxxxxxxxx> commit 46384d0990bf99ed8b597e8794ea581e2a647710 upstream. This is kernel code, so specifying "kernel" is redundant. Let's simplify things and just call it to_errno(). Reviewed-by: Gary Guo <gary@xxxxxxxxxxx> Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@xxxxxxxxx> Signed-off-by: Asahi Lina <lina@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20230224-rust-error-v3-1-03779bddc02b@xxxxxxxxxxxxx Signed-off-by: Miguel Ojeda <ojeda@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- rust/kernel/error.rs | 2 +- rust/macros/module.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -25,7 +25,7 @@ pub struct Error(core::ffi::c_int); impl Error { /// Returns the kernel error code. - pub fn to_kernel_errno(self) -> core::ffi::c_int { + pub fn to_errno(self) -> core::ffi::c_int { self.0 } } --- a/rust/macros/module.rs +++ b/rust/macros/module.rs @@ -258,7 +258,7 @@ pub(crate) fn module(ts: TokenStream) -> return 0; }} Err(e) => {{ - return e.to_kernel_errno(); + return e.to_errno(); }} }} }}