diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2025-07-18 16:26:11 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2025-08-15 12:02:55 +0900 |
| commit | b567daf4ea4e4565118436aca51d12adf8ab3e12 (patch) | |
| tree | c5c69bf3f5e6f880c92aca4082d8e9ea4a651efc /drivers/gpu | |
| parent | gpu: nova-core: register: simplify @leaf_accessor rule (diff) | |
| download | linux-b567daf4ea4e4565118436aca51d12adf8ab3e12.tar.gz linux-b567daf4ea4e4565118436aca51d12adf8ab3e12.zip | |
gpu: nova-core: register: remove `try_` accessors for relative registers
Relative registers are always accessed using a literal base, meaning
their validity can always be checked at compile-time. Thus remove the
`try_` accessors that have no purpose.
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://lore.kernel.org/r/20250718-nova-regs-v2-6-7b6a762aa1cd@nvidia.com
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/nova-core/regs/macros.rs | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/drivers/gpu/nova-core/regs/macros.rs b/drivers/gpu/nova-core/regs/macros.rs index 44e2a12dce52..0567b3aae4d2 100644 --- a/drivers/gpu/nova-core/regs/macros.rs +++ b/drivers/gpu/nova-core/regs/macros.rs @@ -57,9 +57,7 @@ /// definition, or the field getter and setter methods they are attached to. /// /// Putting a `+` before the address of the register makes it relative to a base: the `read` and -/// `write` methods take a `base` argument that is added to the specified address before access, -/// and `try_read` and `try_write` methods are also created, allowing access with offsets unknown -/// at compile-time: +/// `write` methods take a `base` argument that is added to the specified address before access: /// /// ```no_run /// register!(CPU_CTL @ +0x0000010, "CPU core control" { @@ -386,40 +384,6 @@ macro_rules! register { let reg = f(Self::read(io, base)); reg.write(io, base); } - - #[inline] - pub(crate) fn try_read<const SIZE: usize, T>( - io: &T, - base: usize, - ) -> ::kernel::error::Result<Self> where - T: ::core::ops::Deref<Target = ::kernel::io::Io<SIZE>>, - { - io.try_read32(base + $offset).map(Self) - } - - #[inline] - pub(crate) fn try_write<const SIZE: usize, T>( - self, - io: &T, - base: usize, - ) -> ::kernel::error::Result<()> where - T: ::core::ops::Deref<Target = ::kernel::io::Io<SIZE>>, - { - io.try_write32(self.0, base + $offset) - } - - #[inline] - pub(crate) fn try_alter<const SIZE: usize, T, F>( - io: &T, - base: usize, - f: F, - ) -> ::kernel::error::Result<()> where - T: ::core::ops::Deref<Target = ::kernel::io::Io<SIZE>>, - F: ::core::ops::FnOnce(Self) -> Self, - { - let reg = f(Self::try_read(io, base)?); - reg.try_write(io, base) - } } }; } |
