Commit 956f569c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'rust-net-replace-kernel-c_str-with-c-strings' 

Tamir Duberstein says:

====================
rust: net: 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.
====================

Link: https://patch.msgid.link/20260103-cstr-net-v2-0-8688f504b85d@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 32291cb0 5a69d30f

drivers/net/phy/ax88796b_rust.rs

+3 −4
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
//!

//! C version of this driver: [`drivers/net/phy/ax88796b.c`](./ax88796b.c)

use kernel::{

    c_str,

    net::phy::{self, reg::C22, DeviceId, Driver},

    prelude::*,

    uapi,
@@ -41,7 +40,7 @@ fn asix_soft_reset(dev: &mut phy::Device) -> Result { 
#[vtable]

impl Driver for PhyAX88772A {

    const FLAGS: u32 = phy::flags::IS_INTERNAL;

    const NAME: &'static CStr = c_str!("Asix Electronics AX88772A");

    const NAME: &'static CStr = c"Asix Electronics AX88772A";

    const PHY_DEVICE_ID: DeviceId = DeviceId::new_with_exact_mask(0x003b1861);



    // AX88772A is not working properly with some old switches (NETGEAR EN 108TP):
@@ -105,7 +104,7 @@ fn link_change_notify(dev: &mut phy::Device) { 
#[vtable]

impl Driver for PhyAX88772C {

    const FLAGS: u32 = phy::flags::IS_INTERNAL;

    const NAME: &'static CStr = c_str!("Asix Electronics AX88772C");

    const NAME: &'static CStr = c"Asix Electronics AX88772C";

    const PHY_DEVICE_ID: DeviceId = DeviceId::new_with_exact_mask(0x003b1881);



    fn suspend(dev: &mut phy::Device) -> Result {
@@ -125,7 +124,7 @@ fn soft_reset(dev: &mut phy::Device) -> Result { 


#[vtable]

impl Driver for PhyAX88796B {

    const NAME: &'static CStr = c_str!("Asix Electronics AX88796B");

    const NAME: &'static CStr = c"Asix Electronics AX88796B";

    const PHY_DEVICE_ID: DeviceId = DeviceId::new_with_model_mask(0x003b1841);



    fn soft_reset(dev: &mut phy::Device) -> Result {

drivers/net/phy/qt2025.rs

+2 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
//!

//! The QT2025 PHY integrates an Intel 8051 micro-controller.



use kernel::c_str;

use kernel::error::code;

use kernel::firmware::Firmware;

use kernel::io::poll::read_poll_timeout;
@@ -38,7 +37,7 @@ 


#[vtable]

impl Driver for PhyQT2025 {

    const NAME: &'static CStr = c_str!("QT2025 10Gpbs SFP+");

    const NAME: &'static CStr = c"QT2025 10Gpbs SFP+";

    const PHY_DEVICE_ID: phy::DeviceId = phy::DeviceId::new_with_exact_mask(0x0043a400);



    fn probe(dev: &mut phy::Device) -> Result<()> {
@@ -71,7 +70,7 @@ fn probe(dev: &mut phy::Device) -> Result<()> { 
        // The micro-controller will start running from the boot ROM.

        dev.write(C45::new(Mmd::PCS, 0xe854), 0x00c0)?;



        let fw = Firmware::request(c_str!("qt2025-2.0.3.3.fw"), dev.as_ref())?;

        let fw = Firmware::request(c"qt2025-2.0.3.3.fw", dev.as_ref())?;

        if fw.data().len() > SZ_16K + SZ_8K {

            return Err(code::EFBIG);

        }

rust/kernel/net/phy.rs

+2 −4
Original line number Diff line number Diff line
@@ -777,7 +777,6 @@ const fn as_int(&self) -> u32 { 
///

/// ```

/// # mod module_phy_driver_sample {

/// use kernel::c_str;

/// use kernel::net::phy::{self, DeviceId};

/// use kernel::prelude::*;

///
@@ -796,7 +795,7 @@ const fn as_int(&self) -> u32 { 
///

/// #[vtable]

/// impl phy::Driver for PhySample {

///     const NAME: &'static CStr = c_str!("PhySample");

///     const NAME: &'static CStr = c"PhySample";

///     const PHY_DEVICE_ID: phy::DeviceId = phy::DeviceId::new_with_exact_mask(0x00000001);

/// }

/// # }
@@ -805,7 +804,6 @@ const fn as_int(&self) -> u32 { 
/// This expands to the following code:

///

/// ```ignore

/// use kernel::c_str;

/// use kernel::net::phy::{self, DeviceId};

/// use kernel::prelude::*;

///
@@ -825,7 +823,7 @@ const fn as_int(&self) -> u32 { 
///

/// #[vtable]

/// impl phy::Driver for PhySample {

///     const NAME: &'static CStr = c_str!("PhySample");

///     const NAME: &'static CStr = c"PhySample";

///     const PHY_DEVICE_ID: phy::DeviceId = phy::DeviceId::new_with_exact_mask(0x00000001);

/// }

///