mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
rust: enable clippy::as_underscore lint
In Rust 1.63.0, Clippy introduced the `as_underscore` lint [1]: > The conversion might include lossy conversion or a dangerous cast that > might go undetected due to the type being inferred. > > The lint is allowed by default as using `_` is less wordy than always > specifying the type. Always specifying the type is especially helpful in function call contexts where the inferred type may change at a distance. Specifying the type also allows Clippy to spot more cases of `useless_conversion`. The primary downside is the need to specify the type in trivial getters. There are 4 such functions: 3 have become slightly less ergonomic, 1 was revealed to be a `useless_conversion`. While this doesn't eliminate unchecked `as` conversions, it makes such conversions easier to scrutinize. It also has the slight benefit of removing a degree of freedom on which to bikeshed. Thus apply the changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#as_underscore [1] Reviewed-by: Benno Lossin <benno.lossin@proton.me> Reviewed-by: Boqun Feng <boqun.feng@gmail.com> Signed-off-by: Tamir Duberstein <tamird@gmail.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Danilo Krummrich <dakr@kernel.org> Link: https://lore.kernel.org/r/20250615-ptr-as-ptr-v12-4-f43b024581e8@gmail.com [ Changed `isize` to `c_long`. - Miguel ] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
committed by
Miguel Ojeda
parent
23773bd8da
commit
5e30550558
@@ -61,19 +61,19 @@ struct DevresInner<T> {
|
||||
/// unsafe fn new(paddr: usize) -> Result<Self>{
|
||||
/// // SAFETY: By the safety requirements of this function [`paddr`, `paddr` + `SIZE`) is
|
||||
/// // valid for `ioremap`.
|
||||
/// let addr = unsafe { bindings::ioremap(paddr as _, SIZE as _) };
|
||||
/// let addr = unsafe { bindings::ioremap(paddr as bindings::phys_addr_t, SIZE) };
|
||||
/// if addr.is_null() {
|
||||
/// return Err(ENOMEM);
|
||||
/// }
|
||||
///
|
||||
/// Ok(IoMem(IoRaw::new(addr as _, SIZE)?))
|
||||
/// Ok(IoMem(IoRaw::new(addr as usize, SIZE)?))
|
||||
/// }
|
||||
/// }
|
||||
///
|
||||
/// impl<const SIZE: usize> Drop for IoMem<SIZE> {
|
||||
/// fn drop(&mut self) {
|
||||
/// // SAFETY: `self.0.addr()` is guaranteed to be properly mapped by `Self::new`.
|
||||
/// unsafe { bindings::iounmap(self.0.addr() as _); };
|
||||
/// unsafe { bindings::iounmap(self.0.addr() as *mut c_void); };
|
||||
/// }
|
||||
/// }
|
||||
///
|
||||
@@ -115,8 +115,9 @@ impl<T> DevresInner<T> {
|
||||
|
||||
// SAFETY: `devm_add_action` guarantees to call `Self::devres_callback` once `dev` is
|
||||
// detached.
|
||||
let ret =
|
||||
unsafe { bindings::devm_add_action(dev.as_raw(), Some(inner.callback), data as _) };
|
||||
let ret = unsafe {
|
||||
bindings::devm_add_action(dev.as_raw(), Some(inner.callback), data.cast_mut().cast())
|
||||
};
|
||||
|
||||
if ret != 0 {
|
||||
// SAFETY: We just created another reference to `inner` in order to pass it to
|
||||
@@ -130,7 +131,7 @@ impl<T> DevresInner<T> {
|
||||
}
|
||||
|
||||
fn as_ptr(&self) -> *const Self {
|
||||
self as _
|
||||
self
|
||||
}
|
||||
|
||||
fn remove_action(this: &Arc<Self>) -> bool {
|
||||
|
||||
Reference in New Issue
Block a user