Skip to content

Commit b065537

Browse files
tamirdbroonie
authored andcommitted
rust: regulator: 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. Signed-off-by: Tamir Duberstein <tamird@gmail.com> Reviewed-by: Daniel Almeida <Daniel.almeida@collabora.com> Link: https://patch.msgid.link/20251222-cstr-regulator-v1-1-430e3d517025@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 06d65f2 commit b065537

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

rust/kernel/regulator.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,11 @@ pub fn devm_enable_optional(dev: &Device<Bound>, name: &CStr) -> Result {
122122
///
123123
/// ```
124124
/// # use kernel::prelude::*;
125-
/// # use kernel::c_str;
126125
/// # use kernel::device::Device;
127126
/// # use kernel::regulator::{Voltage, Regulator, Disabled, Enabled};
128127
/// fn enable(dev: &Device, min_voltage: Voltage, max_voltage: Voltage) -> Result {
129128
/// // Obtain a reference to a (fictitious) regulator.
130-
/// let regulator: Regulator<Disabled> = Regulator::<Disabled>::get(dev, c_str!("vcc"))?;
129+
/// let regulator: Regulator<Disabled> = Regulator::<Disabled>::get(dev, c"vcc")?;
131130
///
132131
/// // The voltage can be set before enabling the regulator if needed, e.g.:
133132
/// regulator.set_voltage(min_voltage, max_voltage)?;
@@ -166,12 +165,11 @@ pub fn devm_enable_optional(dev: &Device<Bound>, name: &CStr) -> Result {
166165
///
167166
/// ```
168167
/// # use kernel::prelude::*;
169-
/// # use kernel::c_str;
170168
/// # use kernel::device::Device;
171169
/// # use kernel::regulator::{Voltage, Regulator, Enabled};
172170
/// fn enable(dev: &Device) -> Result {
173171
/// // Obtain a reference to a (fictitious) regulator and enable it.
174-
/// let regulator: Regulator<Enabled> = Regulator::<Enabled>::get(dev, c_str!("vcc"))?;
172+
/// let regulator: Regulator<Enabled> = Regulator::<Enabled>::get(dev, c"vcc")?;
175173
///
176174
/// // Dropping an enabled regulator will disable it. The refcount will be
177175
/// // decremented.
@@ -193,13 +191,12 @@ pub fn devm_enable_optional(dev: &Device<Bound>, name: &CStr) -> Result {
193191
///
194192
/// ```
195193
/// # use kernel::prelude::*;
196-
/// # use kernel::c_str;
197194
/// # use kernel::device::{Bound, Device};
198195
/// # use kernel::regulator;
199196
/// fn enable(dev: &Device<Bound>) -> Result {
200197
/// // Obtain a reference to a (fictitious) regulator and enable it. This
201198
/// // call only returns whether the operation succeeded.
202-
/// regulator::devm_enable(dev, c_str!("vcc"))?;
199+
/// regulator::devm_enable(dev, c"vcc")?;
203200
///
204201
/// // The regulator will be disabled and put when `dev` is unbound.
205202
/// Ok(())

0 commit comments

Comments
 (0)