mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-10 05:39:42 -04:00
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>
This commit is contained in:
@@ -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 @@ pub(crate) fn alter<const SIZE: usize, T, F>(
|
||||
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)
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user