On Fri, 12 Jun 2026 13:34:00 +0100 Gary Guo <[email protected]> wrote: > From: Gary Guo <[email protected]> > > Since commit 5423ef9d4db8 ("rust: pin-init: internal: suppress > `non_snake_case` lint in `[pin_]init!`"), mere use of the non-snake-case > identifiers would not cause the warning to be generated. Thus remove these > allows. > > Signed-off-by: Gary Guo <[email protected]> > --- > This should be applied after the merge window when v7.2-rc1 is backmerged > to drm-rust-next tree, so the pin-init changes are picked up. > --- > drivers/gpu/nova-core/gsp/fw.rs | 8 -------- > drivers/gpu/nova-core/gsp/fw/commands.rs | 2 -- > 2 files changed, 10 deletions(-) > > diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw.rs > index 4db0cfa4dc4d..d96ea0b216b4 100644 > --- a/drivers/gpu/nova-core/gsp/fw.rs > +++ b/drivers/gpu/nova-core/gsp/fw.rs > @@ -219,7 +219,6 @@ pub(crate) fn new<'a>( > gsp_firmware: &'a GspFirmware, > fb_layout: &'a FbLayout, > ) -> impl Init<Self> + 'a { > - #[allow(non_snake_case)] > let init_inner = init!(bindings::GspFwWprMeta { > // CAST: we want to store the bits of `GSP_FW_WPR_META_MAGIC` > unmodified. > magic: bindings::GSP_FW_WPR_META_MAGIC as u64, > @@ -674,7 +673,6 @@ fn id8(name: &str) -> u64 { > u64::from_ne_bytes(bytes) > } > > - #[allow(non_snake_case)] > let init_inner = init!(bindings::LibosMemoryRegionInitArgument { > id8: id8(name), > pa: obj.dma_handle(), > @@ -793,7 +791,6 @@ impl GspMsgElement { > /// * `sequence` - Sequence number of the message. > /// * `cmd_size` - Size of the command (not including the message > element), in bytes. > /// * `function` - Function of the message. > - #[allow(non_snake_case)] > pub(crate) fn init( > sequence: u32, > cmd_size: usize, > @@ -876,7 +873,6 @@ pub(crate) struct GspArgumentsCached { > impl GspArgumentsCached { > /// Creates the arguments for starting the GSP up using `cmdq` as its > command queue. > pub(crate) fn new(cmdq: &Cmdq) -> impl Init<Self> + '_ { > - #[allow(non_snake_case)] > let init_inner = init!(bindings::GSP_ARGUMENTS_CACHED { > messageQueueInitArguments <- > MessageQueueInitArguments::new(cmdq), > bDmemStack: 1, > @@ -923,7 +919,6 @@ unsafe impl FromBytes for GspArgumentsPadded {} > > impl MessageQueueInitArguments { > /// Creates a new init arguments structure for `cmdq`. > - #[allow(non_snake_case)] > fn new(cmdq: &Cmdq) -> impl Init<Self> + '_ { > init!(MessageQueueInitArguments { > sharedMemPhysAddr: cmdq.dma_handle, > @@ -947,7 +942,6 @@ pub(crate) enum GspDmaTarget { > > impl GspAcrBootGspRmParams { > fn new(target: GspDmaTarget, wpr_meta_addr: u64) -> impl Init<Self> { > - #[allow(non_snake_case)] > let params = init!(Self { > target: target as u32, > gspRmDescSize: num::usize_into_u32::<{ size_of::<GspFwWprMeta>() > }>(), > @@ -966,7 +960,6 @@ fn new(target: GspDmaTarget, wpr_meta_addr: u64) -> impl > Init<Self> { > > impl GspRmParams { > fn new(target: GspDmaTarget, libos_addr: u64) -> impl Init<Self> { > - #[allow(non_snake_case)] > let params = init!(Self { > target: target as u32, > bootArgsOffset: libos_addr, > @@ -986,7 +979,6 @@ unsafe impl FromBytes for GspFmcBootParams {} > > impl GspFmcBootParams { > pub(crate) fn new(wpr_meta_addr: u64, libos_addr: u64) -> impl > Init<Self> { > - #[allow(non_snake_case)] > let init = init!(Self { > // Blackwell FSP obtains WPR info from other sources, so > // wprCarveoutOffset and wprCarveoutSize are left zero. > diff --git a/drivers/gpu/nova-core/gsp/fw/commands.rs > b/drivers/gpu/nova-core/gsp/fw/commands.rs > index 7bcc41fc7fa0..6c31d825b746 100644 > --- a/drivers/gpu/nova-core/gsp/fw/commands.rs > +++ b/drivers/gpu/nova-core/gsp/fw/commands.rs > @@ -27,7 +27,6 @@ pub(crate) struct GspSetSystemInfo { > > impl GspSetSystemInfo { > /// Returns an in-place initializer for the `GspSetSystemInfo` command. > - #[allow(non_snake_case)] > pub(crate) fn init<'a>( > dev: &'a pci::Device<device::Bound>, > chipset: Chipset, > @@ -99,7 +98,6 @@ pub(crate) struct PackedRegistryTable { > } > > impl PackedRegistryTable { > - #[allow(non_snake_case)] > pub(crate) fn init(num_entries: u32, size: u32) -> impl Init<Self> { > type InnerPackedRegistryTable = bindings::PACKED_REGISTRY_TABLE; > let init_inner = init!(InnerPackedRegistryTable { > > base-commit: 614f7220e548a8df6262887c0140d9267841dbc1 > -- > 2.54.0 >
Reviewed-by: Onur Özkan <[email protected]>
