Skip to content

Commit 72ad884

Browse files
committed
rust: macros: use core::ffi instead of kernel::c_types
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent a4a52ea commit 72ad884

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

rust/macros/module.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream {
413413
let kparam = format!(
414414
"
415415
kernel::bindings::kernel_param__bindgen_ty_1 {{
416-
arg: unsafe {{ &__{name}_{param_name}_value }} as *const _ as *mut kernel::c_types::c_void,
416+
arg: unsafe {{ &__{name}_{param_name}_value }} as *const _ as *mut core::ffi::c_void,
417417
}},
418418
",
419419
name = info.name,
@@ -443,10 +443,10 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream {
443443
}}
444444
445445
#[cfg(not(MODULE))]
446-
const __{name}_{param_name}_name: *const kernel::c_types::c_char = b\"{name}.{param_name}\\0\" as *const _ as *const kernel::c_types::c_char;
446+
const __{name}_{param_name}_name: *const core::ffi::c_char = b\"{name}.{param_name}\\0\" as *const _ as *const core::ffi::c_char;
447447
448448
#[cfg(MODULE)]
449-
const __{name}_{param_name}_name: *const kernel::c_types::c_char = b\"{param_name}\\0\" as *const _ as *const kernel::c_types::c_char;
449+
const __{name}_{param_name}_name: *const core::ffi::c_char = b\"{param_name}\\0\" as *const _ as *const core::ffi::c_char;
450450
451451
#[link_section = \"__param\"]
452452
#[used]
@@ -523,7 +523,7 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream {
523523
#[cfg(MODULE)]
524524
#[doc(hidden)]
525525
#[no_mangle]
526-
pub extern \"C\" fn init_module() -> kernel::c_types::c_int {{
526+
pub extern \"C\" fn init_module() -> core::ffi::c_int {{
527527
__init()
528528
}}
529529
@@ -541,7 +541,7 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream {
541541
#[doc(hidden)]
542542
#[link_section = \"{initcall_section}\"]
543543
#[used]
544-
pub static __{name}_initcall: extern \"C\" fn() -> kernel::c_types::c_int = __{name}_init;
544+
pub static __{name}_initcall: extern \"C\" fn() -> core::ffi::c_int = __{name}_init;
545545
546546
#[cfg(not(MODULE))]
547547
#[cfg(CONFIG_HAVE_ARCH_PREL32_RELOCATIONS)]
@@ -556,7 +556,7 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream {
556556
#[cfg(not(MODULE))]
557557
#[doc(hidden)]
558558
#[no_mangle]
559-
pub extern \"C\" fn __{name}_init() -> kernel::c_types::c_int {{
559+
pub extern \"C\" fn __{name}_init() -> core::ffi::c_int {{
560560
__init()
561561
}}
562562
@@ -567,7 +567,7 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream {
567567
__exit()
568568
}}
569569
570-
fn __init() -> kernel::c_types::c_int {{
570+
fn __init() -> core::ffi::c_int {{
571571
match <{type_} as kernel::Module>::init(kernel::c_str!(\"{name}\"), &THIS_MODULE) {{
572572
Ok(m) => {{
573573
unsafe {{

0 commit comments

Comments
 (0)