Commit 1f7b0166 authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

rust: pci: get rid of redundant Result in IRQ methods 



Currently request_irq() returns

	Result<impl PinInit<irq::Registration<T>, Error> + 'a>

which may carry an error in the Result or the initializer; the same is
true for request_threaded_irq().

Use pin_init::pin_init_scope() to get rid of this redundancy.

Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Link: https://patch.msgid.link/20251103203053.2348783-1-dakr@kernel.org


Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
parent 1bf5b90c

rust/kernel/pci/irq.rs

+13 −9
Original line number Diff line number Diff line
@@ -175,10 +175,12 @@ pub fn request_irq<'a, T: crate::irq::Handler + 'static>( 
        flags: irq::Flags,

        name: &'static CStr,

        handler: impl PinInit<T, Error> + 'a,

    ) -> Result<impl PinInit<irq::Registration<T>, Error> + 'a> {

    ) -> impl PinInit<irq::Registration<T>, Error> + 'a {

        pin_init::pin_init_scope(move || {

            let request = vector.try_into()?;



            Ok(irq::Registration::<T>::new(request, flags, name, handler))

        })

    }



    /// Returns a [`kernel::irq::ThreadedRegistration`] for the given IRQ vector.
@@ -188,12 +190,14 @@ pub fn request_threaded_irq<'a, T: crate::irq::ThreadedHandler + 'static>( 
        flags: irq::Flags,

        name: &'static CStr,

        handler: impl PinInit<T, Error> + 'a,

    ) -> Result<impl PinInit<irq::ThreadedRegistration<T>, Error> + 'a> {

    ) -> impl PinInit<irq::ThreadedRegistration<T>, Error> + 'a {

        pin_init::pin_init_scope(move || {

            let request = vector.try_into()?;



            Ok(irq::ThreadedRegistration::<T>::new(

                request, flags, name, handler,

            ))

        })

    }



    /// Allocate IRQ vectors for this PCI device with automatic cleanup.