All users have been converted to use keyworded index projection syntax to explicitly state their intention when doing index projection.
Reviewed-by: Alexandre Courbot <[email protected]> Reviewed-by: Andreas Hindborg <[email protected]> Reviewed-by: Alice Ryhl <[email protected]> Signed-off-by: Gary Guo <[email protected]> --- rust/kernel/dma.rs | 6 ------ rust/kernel/ptr/projection.rs | 8 -------- 2 files changed, 14 deletions(-) diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs index 79125ee012a9..200def84fb69 100644 --- a/rust/kernel/dma.rs +++ b/rust/kernel/dma.rs @@ -1210,12 +1210,6 @@ macro_rules! dma_write { (@parse [$dma:expr] [$($proj:tt)*] [[$flavor:ident: $index:expr] $($rest:tt)*]) => { $crate::dma_write!(@parse [$dma] [$($proj)* [$flavor: $index]] [$($rest)*]) }; - (@parse [$dma:expr] [$($proj:tt)*] [[$index:expr]? $($rest:tt)*]) => { - $crate::dma_write!(@parse [$dma] [$($proj)* [$index]?] [$($rest)*]) - }; - (@parse [$dma:expr] [$($proj:tt)*] [[$index:expr] $($rest:tt)*]) => { - $crate::dma_write!(@parse [$dma] [$($proj)* [$index]] [$($rest)*]) - }; ($dma:expr, $($rest:tt)*) => { $crate::dma_write!(@parse [$dma] [] [$($rest)*]) }; diff --git a/rust/kernel/ptr/projection.rs b/rust/kernel/ptr/projection.rs index e46877a208d9..c6e9dfbc4f9a 100644 --- a/rust/kernel/ptr/projection.rs +++ b/rust/kernel/ptr/projection.rs @@ -351,14 +351,6 @@ macro_rules! project_pointer { $crate::ptr::project!(@gen $ptr, $($rest)*) }; - // For compatibility - (@gen $ptr:ident, [$index:expr]? $($rest:tt)*) => { - $crate::ptr::project!(@gen $ptr, [try: $index] $($rest)*) - }; - (@gen $ptr:ident, [$index:expr] $($rest:tt)*) => { - $crate::ptr::project!(@gen $ptr, [build: $index] $($rest)*) - }; - (mut $ptr:expr, $($proj:tt)*) => {{ let ptr: *mut _ = $ptr; $crate::ptr::project!(@gen ptr, $($proj)*); -- 2.54.0
