diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 23:00:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 23:00:36 +0100 |
| commit | 5438eb458830693c5f8481aa36097245a727e2c2 (patch) | |
| tree | ace854c43e06a39fcfebf8b68171423643cf7581 /samples | |
| parent | 9200c83233d5ca5e921deab98602277df9f99f9f (diff) | |
| parent | 5ad28496055858166eb2268344c8fda2c26d3561 (diff) | |
| download | linux-next-history-5438eb458830693c5f8481aa36097245a727e2c2.tar.gz | |
Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
# Conflicts:
# drivers/gpib/cb7210/cb7210.c
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/rust/rust_misc_device.rs | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/samples/rust/rust_misc_device.rs b/samples/rust/rust_misc_device.rs index 87a1fe63533ae..41e26c825060b 100644 --- a/samples/rust/rust_misc_device.rs +++ b/samples/rust/rust_misc_device.rs @@ -97,14 +97,36 @@ use kernel::{ device::Device, - fs::{File, Kiocb}, - ioctl::{_IO, _IOC_SIZE, _IOR, _IOW}, - iov::{IovIterDest, IovIterSource}, - miscdevice::{MiscDevice, MiscDeviceOptions, MiscDeviceRegistration}, + fs::{ + File, + Kiocb, // + }, + ioctl::{ + _IO, + _IOC_SIZE, + _IOR, + _IOW, // + }, + iov::{ + IovIterDest, + IovIterSource, // + }, + miscdevice::{ + MiscDevice, + MiscDeviceOptions, + MiscDeviceRegistration, // + }, new_mutex, prelude::*, - sync::{aref::ARef, Mutex}, - uaccess::{UserSlice, UserSliceReader, UserSliceWriter}, + sync::{ + aref::ARef, + Mutex, // + }, + uaccess::{ + UserSlice, + UserSliceReader, + UserSliceWriter, // + }, }; const RUST_MISC_DEV_HELLO: u32 = _IO('|' as u32, 0x80); |