Hi Tamir, Please cc me for any Tyr changes.
> On 22 Dec 2025, at 09:27, Tamir Duberstein <[email protected]> wrote: > > From: Tamir Duberstein <[email protected]> > > 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 <[email protected]> > --- > drivers/gpu/drm/tyr/driver.rs | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/tyr/driver.rs b/drivers/gpu/drm/tyr/driver.rs > index 0389c558c036..65405f365fec 100644 > --- a/drivers/gpu/drm/tyr/driver.rs > +++ b/drivers/gpu/drm/tyr/driver.rs > @@ -1,6 +1,5 @@ > // SPDX-License-Identifier: GPL-2.0 or MIT > > -use kernel::c_str; > use kernel::clk::Clk; > use kernel::clk::OptionalClk; > use kernel::device::Bound; > @@ -91,8 +90,8 @@ fn issue_soft_reset(dev: &Device<Bound>, iomem: > &Devres<IoMem>) -> Result { > MODULE_OF_TABLE, > <TyrDriver as platform::Driver>::IdInfo, > [ > - (of::DeviceId::new(c_str!("rockchip,rk3588-mali")), ()), > - (of::DeviceId::new(c_str!("arm,mali-valhall-csf")), ()) > + (of::DeviceId::new(c"rockchip,rk3588-mali"), ()), > + (of::DeviceId::new(c"arm,mali-valhall-csf"), ()) > ] > ); > > @@ -104,16 +103,16 @@ fn probe( > pdev: &platform::Device<Core>, > _info: Option<&Self::IdInfo>, > ) -> impl PinInit<Self, Error> { > - let core_clk = Clk::get(pdev.as_ref(), Some(c_str!("core")))?; > - let stacks_clk = OptionalClk::get(pdev.as_ref(), > Some(c_str!("stacks")))?; > - let coregroup_clk = OptionalClk::get(pdev.as_ref(), > Some(c_str!("coregroup")))?; > + let core_clk = Clk::get(pdev.as_ref(), Some(c"core"))?; > + let stacks_clk = OptionalClk::get(pdev.as_ref(), Some(c"stacks"))?; > + let coregroup_clk = OptionalClk::get(pdev.as_ref(), > Some(c"coregroup"))?; > > core_clk.prepare_enable()?; > stacks_clk.prepare_enable()?; > coregroup_clk.prepare_enable()?; > > - let mali_regulator = > Regulator::<regulator::Enabled>::get(pdev.as_ref(), c_str!("mali"))?; > - let sram_regulator = > Regulator::<regulator::Enabled>::get(pdev.as_ref(), c_str!("sram"))?; > + let mali_regulator = > Regulator::<regulator::Enabled>::get(pdev.as_ref(), c"mali")?; > + let sram_regulator = > Regulator::<regulator::Enabled>::get(pdev.as_ref(), c"sram")?; > > let request = pdev.io_request_by_index(0).ok_or(ENODEV)?; > let iomem = Arc::pin_init(request.iomap_sized::<SZ_2M>(), > GFP_KERNEL)?; > @@ -174,8 +173,8 @@ fn drop(self: Pin<&mut Self>) { > major: 1, > minor: 5, > patchlevel: 0, > - name: c_str!("panthor"), > - desc: c_str!("ARM Mali Tyr DRM driver"), > + name: c"panthor", > + desc: c"ARM Mali Tyr DRM driver", > }; > > #[vtable] > > --- > base-commit: 8f0b4cce4481fb22653697cced8d0d04027cb1e8 > change-id: 20251222-cstr-tyr-37ee95790f5f > > Best regards, > -- > Tamir Duberstein <[email protected]> > > Reviewed-by: Daniel Almeida <[email protected]>
