Now that SysmemFlush is lifetime-parameterized, the ARef<Device> is unnecessary -- a plain &'bound Device reference suffices.
Signed-off-by: Danilo Krummrich <[email protected]> --- drivers/gpu/nova-core/fb.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/nova-core/fb.rs b/drivers/gpu/nova-core/fb.rs index a707fbfe3ced..e22dec12ae7e 100644 --- a/drivers/gpu/nova-core/fb.rs +++ b/drivers/gpu/nova-core/fb.rs @@ -15,8 +15,7 @@ Alignable, Alignment, // }, - sizes::*, - sync::aref::ARef, // + sizes::*, // }; use crate::{ @@ -49,7 +48,7 @@ pub(crate) struct SysmemFlush<'bound> { /// Chipset we are operating on. chipset: Chipset, - device: ARef<device::Device>, + device: &'bound device::Device, bar: &'bound Bar0, /// Keep the page alive as long as we need it. page: CoherentHandle, @@ -58,7 +57,7 @@ pub(crate) struct SysmemFlush<'bound> { impl<'bound> SysmemFlush<'bound> { /// Allocate a memory page and register it as the sysmem flush page. pub(crate) fn register( - dev: &device::Device<device::Bound>, + dev: &'bound device::Device<device::Bound>, bar: &'bound Bar0, chipset: Chipset, ) -> Result<Self> { @@ -68,7 +67,7 @@ pub(crate) fn register( Ok(Self { chipset, - device: dev.into(), + device: dev, bar, page, }) -- 2.54.0
