Commit e05d9e5c authored by Tamir Duberstein's avatar Tamir Duberstein Committed by Viresh Kumar
Browse files

rust: cpufreq: replace `kernel::c_str!` with C-Strings 



C-String literals were added in Rust 1.77. Replace instances of
`kernel::c_str!` with C-String literals where possible.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarBenno Lossin <lossin@kernel.org>
Signed-off-by: default avatarTamir Duberstein <tamird@gmail.com>
Reviewed-by: default avatarDaniel Almeida <daniel.almeida@collabora.com>
Acked-by: default avatarDanilo Krummrich <dakr@kernel.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent d6a6c58d

drivers/cpufreq/rcpufreq_dt.rs

+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
//! Rust based implementation of the cpufreq-dt driver.



use kernel::{

    c_str,

    clk::Clk,

    cpu, cpufreq,

    cpumask::CpumaskVar,
@@ -52,7 +51,7 @@ impl opp::ConfigOps for CPUFreqDTDriver {} 


#[vtable]

impl cpufreq::Driver for CPUFreqDTDriver {

    const NAME: &'static CStr = c_str!("cpufreq-dt");

    const NAME: &'static CStr = c"cpufreq-dt";

    const FLAGS: u16 = cpufreq::flags::NEED_INITIAL_FREQ_CHECK | cpufreq::flags::IS_COOLING_DEV;

    const BOOST_ENABLED: bool = true;
@@ -197,7 +196,7 @@ fn register_em(policy: &mut cpufreq::Policy) { 
    OF_TABLE,

    MODULE_OF_TABLE,

    <CPUFreqDTDriver as platform::Driver>::IdInfo,

    [(of::DeviceId::new(c_str!("operating-points-v2")), ())]

    [(of::DeviceId::new(c"operating-points-v2"), ())]

);



impl platform::Driver for CPUFreqDTDriver {

rust/kernel/cpufreq.rs

+1 −2
Original line number Diff line number Diff line
@@ -840,7 +840,6 @@ fn register_em(_policy: &mut Policy) { 
/// ```

/// use kernel::{

///     cpufreq,

///     c_str,

///     device::{Core, Device},

///     macros::vtable,

///     of, platform,
@@ -853,7 +852,7 @@ fn register_em(_policy: &mut Policy) { 
///

/// #[vtable]

/// impl cpufreq::Driver for SampleDriver {

///     const NAME: &'static CStr = c_str!("cpufreq-sample");

///     const NAME: &'static CStr = c"cpufreq-sample";

///     const FLAGS: u16 = cpufreq::flags::NEED_INITIAL_FREQ_CHECK | cpufreq::flags::IS_COOLING_DEV;

///     const BOOST_ENABLED: bool = true;

///