mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
Merge tag 'configfs-for-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux
Pull configfs updates from Andreas Hindborg: - Switch the configfs rust bindings to use c string literals provided by the compiler, rather than a macro - A follow up on constifying `configfs_item_operations`, applying the change to the configfs sample * tag 'configfs-for-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux: samples: configfs: Constify struct configfs_item_operations and configfs_group_operations rust: configfs: replace `kernel::c_str!` with C-Strings
This commit is contained in:
@@ -21,7 +21,6 @@
|
||||
//!
|
||||
//! ```ignore
|
||||
//! use kernel::alloc::flags;
|
||||
//! use kernel::c_str;
|
||||
//! use kernel::configfs_attrs;
|
||||
//! use kernel::configfs;
|
||||
//! use kernel::new_mutex;
|
||||
@@ -50,7 +49,7 @@
|
||||
//!
|
||||
//! try_pin_init!(Self {
|
||||
//! config <- configfs::Subsystem::new(
|
||||
//! c_str!("rust_configfs"), item_type, Configuration::new()
|
||||
//! c"rust_configfs", item_type, Configuration::new()
|
||||
//! ),
|
||||
//! })
|
||||
//! }
|
||||
@@ -66,7 +65,7 @@
|
||||
//! impl Configuration {
|
||||
//! fn new() -> impl PinInit<Self, Error> {
|
||||
//! try_pin_init!(Self {
|
||||
//! message: c_str!("Hello World\n"),
|
||||
//! message: c"Hello World\n",
|
||||
//! bar <- new_mutex!((KBox::new([0; PAGE_SIZE], flags::GFP_KERNEL)?, 0)),
|
||||
//! })
|
||||
//! }
|
||||
@@ -1000,7 +999,9 @@ macro_rules! configfs_attrs {
|
||||
static [< $data:upper _ $name:upper _ATTR >]:
|
||||
$crate::configfs::Attribute<$attr, $data, $data> =
|
||||
unsafe {
|
||||
$crate::configfs::Attribute::new(c_str!(::core::stringify!($name)))
|
||||
$crate::configfs::Attribute::new(
|
||||
$crate::c_str!(::core::stringify!($name)),
|
||||
)
|
||||
};
|
||||
)*
|
||||
|
||||
|
||||
Reference in New Issue
Block a user