From: Lukas Bulwahn <[email protected]> Since commit 94f8f319cbcb ("drm: Remove Kconfig option for legacy support (CONFIG_DRM_LEGACY)"), the special handling in the rust drm code for the config DRM_LEGACY is not needed.
Remove the drm_legacy_fields macro and simply use bindings::drm_driver unconditionally. Signed-off-by: Lukas Bulwahn <[email protected]> --- rust/kernel/drm/device.rs | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/rust/kernel/drm/device.rs b/rust/kernel/drm/device.rs index 3ce8f62a0056..a1d92d8922a4 100644 --- a/rust/kernel/drm/device.rs +++ b/rust/kernel/drm/device.rs @@ -16,37 +16,6 @@ }; use core::{alloc::Layout, mem, ops::Deref, ptr, ptr::NonNull}; -#[cfg(CONFIG_DRM_LEGACY)] -macro_rules! drm_legacy_fields { - ( $($field:ident: $val:expr),* $(,)? ) => { - bindings::drm_driver { - $( $field: $val ),*, - firstopen: None, - preclose: None, - dma_ioctl: None, - dma_quiescent: None, - context_dtor: None, - irq_handler: None, - irq_preinstall: None, - irq_postinstall: None, - irq_uninstall: None, - get_vblank_counter: None, - enable_vblank: None, - disable_vblank: None, - dev_priv_size: 0, - } - } -} - -#[cfg(not(CONFIG_DRM_LEGACY))] -macro_rules! drm_legacy_fields { - ( $($field:ident: $val:expr),* $(,)? ) => { - bindings::drm_driver { - $( $field: $val ),* - } - } -} - /// A typed DRM device with a specific `drm::Driver` implementation. /// /// The device is always reference-counted. @@ -61,7 +30,7 @@ pub struct Device<T: drm::Driver> { } impl<T: drm::Driver> Device<T> { - const VTABLE: bindings::drm_driver = drm_legacy_fields! { + const VTABLE: bindings::drm_driver = bindings::drm_driver { load: None, open: Some(drm::File::<T::File>::open_callback), postclose: Some(drm::File::<T::File>::postclose_callback), -- 2.51.0
