Rename the generic lifetime parameter from 'a to 'bound in nova-core. This makes it explicit that the lifetime represents the device binding scope, consistent with the convention established by the HRT series.
Signed-off-by: Danilo Krummrich <[email protected]> --- drivers/gpu/nova-core/firmware/gsp.rs | 8 ++++---- drivers/gpu/nova-core/gpu.rs | 8 ++++---- drivers/gpu/nova-core/gsp/commands.rs | 10 +++++----- drivers/gpu/nova-core/gsp/fw/commands.rs | 4 +++- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/nova-core/firmware/gsp.rs b/drivers/gpu/nova-core/firmware/gsp.rs index 2fcc255c3bc8..9dbd88c55f7e 100644 --- a/drivers/gpu/nova-core/firmware/gsp.rs +++ b/drivers/gpu/nova-core/firmware/gsp.rs @@ -65,11 +65,11 @@ pub(crate) struct GspFirmware { impl GspFirmware { /// Loads the GSP firmware binaries, map them into `dev`'s address-space, and creates the page /// tables expected by the GSP bootloader to load it. - pub(crate) fn new<'a>( - dev: &'a device::Device<device::Bound>, + pub(crate) fn new<'bound>( + dev: &'bound device::Device<device::Bound>, chipset: Chipset, - ver: &'a str, - ) -> impl PinInit<Self, Error> + 'a { + ver: &'bound str, + ) -> impl PinInit<Self, Error> + 'bound { pin_init::pin_init_scope(move || { let firmware = super::request_firmware(dev, chipset, "gsp", ver)?; diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 0f6fe9a1b955..9288b30fe4c3 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -241,11 +241,11 @@ pub(crate) struct Gpu { } impl Gpu { - pub(crate) fn new<'a>( - pdev: &'a pci::Device<device::Bound>, + pub(crate) fn new<'bound>( + pdev: &'bound pci::Device<device::Bound>, devres_bar: Arc<Devres<Bar0>>, - bar: &'a Bar0, - ) -> impl PinInit<Self, Error> + 'a { + bar: &'bound Bar0, + ) -> impl PinInit<Self, Error> + 'bound { try_pin_init!(Self { spec: Spec::new(pdev.as_ref(), bar).inspect(|spec| { dev_info!(pdev,"NVIDIA ({})\n", spec); diff --git a/drivers/gpu/nova-core/gsp/commands.rs b/drivers/gpu/nova-core/gsp/commands.rs index c89c7b57a751..0da5b92f4b27 100644 --- a/drivers/gpu/nova-core/gsp/commands.rs +++ b/drivers/gpu/nova-core/gsp/commands.rs @@ -35,18 +35,18 @@ }; /// The `GspSetSystemInfo` command. -pub(crate) struct SetSystemInfo<'a> { - pdev: &'a pci::Device<device::Bound>, +pub(crate) struct SetSystemInfo<'bound> { + pdev: &'bound pci::Device<device::Bound>, } -impl<'a> SetSystemInfo<'a> { +impl<'bound> SetSystemInfo<'bound> { /// Creates a new `GspSetSystemInfo` command using the parameters of `pdev`. - pub(crate) fn new(pdev: &'a pci::Device<device::Bound>) -> Self { + pub(crate) fn new(pdev: &'bound pci::Device<device::Bound>) -> Self { Self { pdev } } } -impl<'a> CommandToGsp for SetSystemInfo<'a> { +impl<'bound> CommandToGsp for SetSystemInfo<'bound> { const FUNCTION: MsgFunction = MsgFunction::GspSetSystemInfo; type Command = GspSetSystemInfo; type Reply = NoReply; diff --git a/drivers/gpu/nova-core/gsp/fw/commands.rs b/drivers/gpu/nova-core/gsp/fw/commands.rs index db46276430be..d3ef7ecdd73e 100644 --- a/drivers/gpu/nova-core/gsp/fw/commands.rs +++ b/drivers/gpu/nova-core/gsp/fw/commands.rs @@ -24,7 +24,9 @@ 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>) -> impl Init<Self, Error> + 'a { + pub(crate) fn init<'bound>( + dev: &'bound pci::Device<device::Bound>, + ) -> impl Init<Self, Error> + 'bound { type InnerGspSystemInfo = bindings::GspSystemInfo; let init_inner = try_init!(InnerGspSystemInfo { gpuPhysAddr: dev.resource_start(0)?, -- 2.54.0
