From: Abhinav Ananthu <abhinav.ogl@gmail.com>
Date: Tue, 12 Aug 2025 03:31:02 +0000 (+0530)
Subject: rust: pci: use c_* types via kernel prelude
X-Git-Tag: v6.18-rc1~172^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0d73ad126957df989c26d78bd4747a270244dd0;p=thirdparty%2Fkernel%2Flinux.git

rust: pci: use c_* types via kernel prelude

Update PCI FFI callback signatures to use `c_` from the prelude,
instead of accessing it via `kernel::ffi::`.

Signed-off-by: Abhinav Ananthu <abhinav.ogl@gmail.com>
Reviewed-by: Benno Lossin <lossin@kernel.org>
Link: https://lore.kernel.org/r/20250812033101.5257-1-abhinav.ogl@gmail.com
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
---

diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs
index 3bf1737635a9e..71d25dbcb392b 100644
--- a/rust/kernel/pci.rs
+++ b/rust/kernel/pci.rs
@@ -60,7 +60,7 @@ impl<T: Driver + 'static> Adapter<T> {
     extern "C" fn probe_callback(
         pdev: *mut bindings::pci_dev,
         id: *const bindings::pci_device_id,
-    ) -> kernel::ffi::c_int {
+    ) -> c_int {
         // SAFETY: The PCI bus only ever calls the probe callback with a valid pointer to a
         // `struct pci_dev`.
         //
@@ -347,7 +347,7 @@ impl<const SIZE: usize> Bar<SIZE> {
         // `ioptr` is valid by the safety requirements.
         // `num` is valid by the safety requirements.
         unsafe {
-            bindings::pci_iounmap(pdev.as_raw(), ioptr as *mut kernel::ffi::c_void);
+            bindings::pci_iounmap(pdev.as_raw(), ioptr as *mut c_void);
             bindings::pci_release_region(pdev.as_raw(), num);
         }
     }