Skip to content

Commit ffbf6c3

Browse files
committed
drm/asahi: v6.19 probe change
Signed-off-by: Janne Grunau <[email protected]>
1 parent 7c8aa44 commit ffbf6c3

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/gpu/drm/asahi/driver.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use kernel::{
1111
},
1212
drm,
1313
drm::ioctl,
14-
error::Result,
1514
of,
1615
platform,
1716
prelude::*,
@@ -156,7 +155,7 @@ impl platform::Driver for AsahiDriver {
156155
fn probe(
157156
pdev: &platform::Device<Core>,
158157
info: Option<&Self::IdInfo>,
159-
) -> Result<Pin<KBox<Self>>> {
158+
) -> impl PinInit<Self, Error> {
160159
debug::update_debug_flags();
161160

162161
dev_info!(pdev.as_ref(), "Probing...\n");
@@ -222,6 +221,6 @@ impl platform::Driver for AsahiDriver {
222221

223222
drm::driver::Registration::new_foreign_owned(&drm, pdev.as_ref(), 0)?;
224223

225-
Ok(KBox::new(Self { drm }, GFP_KERNEL)?.into())
224+
Ok(Self { drm })
226225
}
227226
}

0 commit comments

Comments
 (0)