Commit a762f883 authored by Miguel Ojeda's avatar Miguel Ojeda Committed by Danilo Krummrich
Browse files

rust: i2c: prepare for `core::ffi::CStr` 

The rust-next tree contains commit:

    3b83f5d5 ("rust: replace `CStr` with `core::ffi::CStr`")

which, when merged together with commits:

    57c5bd9a ("rust: i2c: add basic I2C device and driver abstractions")
    f3cc26a4 ("rust: i2c: add manual I2C device creation abstractions")

from this tree (driver-core), produces errors like the following:

    error[E0599]: no method named `len_with_nul` found for reference `&'static ffi::CStr` in the current scope
      --> rust/kernel/i2c.rs:48:16
       |
    48 |             id.len_with_nul() <= Self::I2C_NAME_SIZE,
       |                ^^^^^^^^^^^^ method not found in `&CStr`

    error[E0599]: no method named `as_bytes_with_nul` found for reference `&'static ffi::CStr` in the current scope
      --> rust/kernel/i2c.rs:51:22
       |
    51 |         let src = id.as_bytes_with_nul();
       |                      ^^^^^^^^^^^^^^^^^
       |
    help: there is a method `to_bytes_with_nul` with a similar name
       |
    51 |         let src = id.to_bytes_with_nul();
       |                      ~~~~~~~~~~~~~~~~~

which were detected in linux-next by Stephen [1].

The `i2c` code can be independently prepared to be ready for the change,
thus do so.

The change is similar to the one done by Tamir in commit 65740363
("rust: acpi: use `core::ffi::CStr` method names").

Link: https://lore.kernel.org/all/20251120181111.65ce75a0@canb.auug.org.au/

 [1]
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
Link: https://patch.msgid.link/20251123163536.1771801-1-ojeda@kernel.org


Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
parent 46354064

rust/kernel/i2c.rs

+4 −10
Original line number Diff line number Diff line
@@ -44,11 +44,8 @@ impl DeviceId { 
    /// Create a new device id from an I2C 'id' string.

    #[inline(always)]

    pub const fn new(id: &'static CStr) -> Self {

        build_assert!(

            id.len_with_nul() <= Self::I2C_NAME_SIZE,

            "ID exceeds 20 bytes"

        );

        let src = id.as_bytes_with_nul();

        let src = id.to_bytes_with_nul();

        build_assert!(src.len() <= Self::I2C_NAME_SIZE, "ID exceeds 20 bytes");

        let mut i2c: bindings::i2c_device_id = pin_init::zeroed();

        let mut i = 0;

        while i < src.len() {
@@ -434,11 +431,8 @@ impl I2cBoardInfo { 
    /// Create a new [`I2cBoardInfo`] for a kernel driver.

    #[inline(always)]

    pub const fn new(type_: &'static CStr, addr: u16) -> Self {

        build_assert!(

            type_.len_with_nul() <= Self::I2C_TYPE_SIZE,

            "Type exceeds 20 bytes"

        );

        let src = type_.as_bytes_with_nul();

        let src = type_.to_bytes_with_nul();

        build_assert!(src.len() <= Self::I2C_TYPE_SIZE, "Type exceeds 20 bytes");

        let mut i2c_board_info: bindings::i2c_board_info = pin_init::zeroed();

        let mut i: usize = 0;

        while i < src.len() {