From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D3F02EA736; Wed, 18 Jun 2025 13:50:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750254661; cv=none; b=sK1+vJ9OT1pnye10bqsElXjlQ6aX7lQX6IjWenZ5KfqV+d2amqdDyLJFEz6SgWFz/BKjlIG2/WYT8eAUGLKw8JKBVjeQG4S4dah5ii78LCDSDsB2Bsm/cUipvro48Hcq4uRfQ6EXczAPpjjjj/O4kjSBfNe+MXo7+Q5rS2vjQxM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750254661; c=relaxed/simple; bh=e41YgB7CgMFPNxw8U5+jmkDG9G/Ws6YZtXM8JJz0yl4=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=KSebrSgcbzXM/1wdS+Ab1KgYZkv9A0s+9Vtg9siTnlLwB0xefdQ6tcH7BitXuW/yPOnP9g6wgxWSn/2suk2ghXV1ykze2gP3U4YMA5hSGwrw9gupDQnJL6shrMLvEhjaT5pz/TIJH9WBIly6pQVtFm9SsJevSPzkZjvtMid7S8w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=efFuoTk2; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="efFuoTk2" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-32934448e8bso57873921fa.3; Wed, 18 Jun 2025 06:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750254656; x=1750859456; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=hWdv2N0cIkk9uXZTWKnqHCXi3z+s1fVxPBhcJKME6wE=; b=efFuoTk2AQsxDAy40Bk/9d5Zvx27+uC42PxJyLLtfR9yHUfSXBNX93Upvtwlgp+DGc zv7iiqOYQelPnH+9wWCM9mjYRDXp1xKG3qYiiCMAXEcvaPjqOClgd30i74wG+lk6IZZb P6/viFrePSboaYClkdZIZ4Ye2nuiIvDI1n+vUUfVMivMheHOiq+oXW4oj2JC0Ayvk3A0 Z6ckfLHIc8wC9ifFWGuFERVsm4x/LPu9+dB0ZMjatmSj4WWvFWn3yT7H/r8SYTbGsQh2 hXrIGruhaw92lcY1IQxczfwZjyYn9p//ygTYI0ikrdrn/yJQcSflrpN33hcP7wDbjaZ6 h4CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750254656; x=1750859456; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hWdv2N0cIkk9uXZTWKnqHCXi3z+s1fVxPBhcJKME6wE=; b=GiMPO/aS8qAcnYQtbzZKwJLU5FiVTSfUPLU8V7GEDSgZdJFP1kxAMBfNPGycrK8gWQ PDC9Sogon3jAP7tK8jz9h5jW12SsdELFAXDZMV9bfctME8RDQ2k2Uprdei59OAF8+zGh kyPNRoXvdphxCkWdVCR85VZgvcp61Hk2pCrOxWE6xdGD29K8szG5dWEoBZWVQIj72ERo d2si0TD5R30X8cqtgqiBclmseKsSMQGBQ+QuLsh1RWgG2MnZJAd+oMryhgHdENk6ikue WMJi43YorEJGuDdxsx0XFJtx4cxqT0/Xv2t/BDQ0VwGzZ/a421TVPsJzJYEkLoGNGRZE mXXA== X-Forwarded-Encrypted: i=1; AJvYcCVFIqP3H5RKcGrMKl6Bba5Ep56MhMdrn/5uTnFgkPXU4bdTmmHnu/8i1NSw0bOctmvRJ44Iq8kHT8dln2we@vger.kernel.org, AJvYcCWJjHS2K/cYQmrLEpB/J+POEscgW58Wo8F+Uvy+Dglcke/eA4YizjA2elUvxhG3RJDeMhkELAFMQP39@vger.kernel.org, AJvYcCWZX5zyf+2JrPDPFUyB3M5kwhlGOemShwoPteFLVo3vIzfhzV4iFcUa0V7ze+pVqw3HZimlVPq5U8MFIRBLzmw=@vger.kernel.org, AJvYcCWiFRhRC51YBzd7b0zwZ+t52oGdWkBQ6Wgk5iLtkH2ZMJAjkBYr4M7MY2s6A8Xth4YR7JVxF0IZV2EsTq8=@vger.kernel.org, AJvYcCWyXL7/PTvL5CK/PQUlyP/Ni+yPfxJMGaCSFevqE6T9oM83kRg57BiqOc7p7W+3xc0x8l1AmYlbsfAz/d613Wsu@vger.kernel.org, AJvYcCXLbtejyegvIXndLSICGZJ2EdffxgyOIty+EmMacz0z2wtB4noh0omZon1vzE4/rW8wdQr9U4mU@vger.kernel.org, AJvYcCXegPFjDooelKKRoGfZOcKY5bKOfYZfL5VnmnQzV3/JTXpTnT7fBjZiFVxTAOufKDgfxiyjGK3vI/8=@vger.kernel.org, AJvYcCXvdSHKYHk/P4r/Fr6dTzMfGKDP2u14n7yBUTNsTDEF5ZnkZPQj6H7YKIPSzxqCOEhBUrb78ssbB2qh@vger.kernel.org X-Gm-Message-State: AOJu0YxjPJJFBBestLOt5QSya4Lbd0ms40BvS0Pf2PciZUVsLGpBh/1B Q4MFqXxjgKEvDu3BlrXX1Ojqxk0Mg0SJwY+tVfkmkaRh2qIMgjcYB4MZjoH3AWBJl9Z+pxkscnu Cz4kHA4GjlgSiAdhY7KOejPwI7FyESrM= X-Gm-Gg: ASbGncuR9Q65mDLdyiKSRsstIODyqLlJPh2X4n7tnX/rpleUvhU4P6OzW2kUqP1aBwF jigcclNtTZdvge2eUo3CFC8NiDpBE89Zu9+wmHRtUIRcMjubN0pPUkLXauhJHymTE5Tp4w9vLJu DJuvMnUauFdMoOtwGmHCcfo23ejE/Ada3UVuId6VwPt4UpoaC8pxqNnme4MCs= X-Google-Smtp-Source: AGHT+IGoc47KrVxU/Wj2sFhYv8DKc+qBJy3QSWc1R3fV7leFu9aAEmgoN70YE6juBnvhmnYd+4gV6719YGwTQW2uFzg= X-Received: by 2002:a05:651c:4019:b0:327:ef96:dc28 with SMTP id 38308e7fff4ca-32b4a46e336mr28788691fa.24.1750254655705; Wed, 18 Jun 2025 06:50:55 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20250615-ptr-as-ptr-v12-0-f43b024581e8@gmail.com> <20250615-ptr-as-ptr-v12-4-f43b024581e8@gmail.com> In-Reply-To: <20250615-ptr-as-ptr-v12-4-f43b024581e8@gmail.com> From: Tamir Duberstein Date: Wed, 18 Jun 2025 09:50:19 -0400 X-Gm-Features: AX0GCFtbLOx6KfGFMLzBJ-cFYCzDu92PIU-LGXU6wi1dQRtA1T6WyHFinCi2Wi4 Message-ID: Subject: Re: [PATCH v12 4/6] rust: enable `clippy::as_underscore` lint To: Masahiro Yamada , Nathan Chancellor , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?Q?Bj=C3=B6rn_Roy_Baron?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Nicolas Schier , Frederic Weisbecker , Lyude Paul , Thomas Gleixner , Anna-Maria Behnsen , Benno Lossin , =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= , John Stultz , Stephen Boyd , Lorenzo Stoakes , "Liam R. Howlett" , Breno Leitao , Viresh Kumar Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-mm@kvack.org, linux-pm@vger.kernel.org, nouveau@lists.freedesktop.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Jun 15, 2025 at 4:55=E2=80=AFPM Tamir Duberstein = wrote: > > 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_unders= core [1] > Reviewed-by: Benno Lossin > Reviewed-by: Boqun Feng > Signed-off-by: Tamir Duberstein @Danilo Krummrich could you please have a look for nova? > --- > Makefile | 1 + > drivers/gpu/nova-core/driver.rs | 2 +- > rust/kernel/block/mq/operations.rs | 2 +- > rust/kernel/block/mq/request.rs | 7 ++++- > rust/kernel/device_id.rs | 2 +- > rust/kernel/devres.rs | 13 +++++----- > rust/kernel/dma.rs | 2 +- > rust/kernel/drm/device.rs | 2 +- > rust/kernel/error.rs | 2 +- > rust/kernel/io.rs | 18 ++++++------- > rust/kernel/miscdevice.rs | 2 +- > rust/kernel/mm/virt.rs | 52 +++++++++++++++++++-------------= ------ > rust/kernel/of.rs | 6 ++--- > rust/kernel/pci.rs | 9 ++++--- > rust/kernel/str.rs | 8 +++--- > rust/kernel/workqueue.rs | 2 +- > 16 files changed, 70 insertions(+), 60 deletions(-) > > diff --git a/Makefile b/Makefile > index bb33023f87c3..0ba22c361de8 100644 > --- a/Makefile > +++ b/Makefile > @@ -480,6 +480,7 @@ export rust_common_flags :=3D --edition=3D2021 \ > -Wunreachable_pub \ > -Wclippy::all \ > -Wclippy::as_ptr_cast_mut \ > + -Wclippy::as_underscore \ > -Wclippy::ignored_unit_patterns \ > -Wclippy::mut_mut \ > -Wclippy::needless_bitwise_bool \ > diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driv= er.rs > index 8c86101c26cb..a0e435dc4656 100644 > --- a/drivers/gpu/nova-core/driver.rs > +++ b/drivers/gpu/nova-core/driver.rs > @@ -19,7 +19,7 @@ pub(crate) struct NovaCore { > MODULE_PCI_TABLE, > ::IdInfo, > [( > - pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_NVIDIA, bindings:= :PCI_ANY_ID as _), > + pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_NVIDIA, bindings:= :PCI_ANY_ID as u32), > () > )] > ); > diff --git a/rust/kernel/block/mq/operations.rs b/rust/kernel/block/mq/op= erations.rs > index 864ff379dc91..c2b98f507bcb 100644 > --- a/rust/kernel/block/mq/operations.rs > +++ b/rust/kernel/block/mq/operations.rs > @@ -101,7 +101,7 @@ impl OperationsVTable { > if let Err(e) =3D ret { > e.to_blk_status() > } else { > - bindings::BLK_STS_OK as _ > + bindings::BLK_STS_OK as bindings::blk_status_t > } > } > > diff --git a/rust/kernel/block/mq/request.rs b/rust/kernel/block/mq/reque= st.rs > index af5c9ac94f36..fefd394f064a 100644 > --- a/rust/kernel/block/mq/request.rs > +++ b/rust/kernel/block/mq/request.rs > @@ -125,7 +125,12 @@ pub fn end_ok(this: ARef) -> Result<(), ARef> { > // success of the call to `try_set_end` guarantees that there ar= e no > // `ARef`s pointing to this request. Therefore it is safe to han= d it > // back to the block layer. > - unsafe { bindings::blk_mq_end_request(request_ptr, bindings::BLK= _STS_OK as _) }; > + unsafe { > + bindings::blk_mq_end_request( > + request_ptr, > + bindings::BLK_STS_OK as bindings::blk_status_t, > + ) > + }; > > Ok(()) > } > diff --git a/rust/kernel/device_id.rs b/rust/kernel/device_id.rs > index 0a4eb56d98f2..f9d55ac7b9e6 100644 > --- a/rust/kernel/device_id.rs > +++ b/rust/kernel/device_id.rs > @@ -82,7 +82,7 @@ impl IdArray { > unsafe { > raw_ids[i] > .as_mut_ptr() > - .byte_offset(T::DRIVER_DATA_OFFSET as _) > + .byte_add(T::DRIVER_DATA_OFFSET) > .cast::() > .write(i); > } > diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs > index 237182446db3..1e44d70687a8 100644 > --- a/rust/kernel/devres.rs > +++ b/rust/kernel/devres.rs > @@ -59,19 +59,19 @@ struct DevresInner { > /// unsafe fn new(paddr: usize) -> Result{ > /// // SAFETY: By the safety requirements of this function [`pad= dr`, `paddr` + `SIZE`) is > /// // valid for `ioremap`. > -/// let addr =3D unsafe { bindings::ioremap(paddr as _, SIZE as = _) }; > +/// let addr =3D unsafe { bindings::ioremap(paddr as bindings::p= hys_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 Drop for IoMem { > /// fn drop(&mut self) { > /// // SAFETY: `self.0.addr()` is guaranteed to be properly mapp= ed by `Self::new`. > -/// unsafe { bindings::iounmap(self.0.addr() as _); }; > +/// unsafe { bindings::iounmap(self.0.addr() as *mut c_void); }; > /// } > /// } > /// > @@ -112,8 +112,9 @@ fn new(dev: &Device, data: T, flags: Flags) ->= Result> > > // SAFETY: `devm_add_action` guarantees to call `Self::devres_ca= llback` once `dev` is > // detached. > - let ret =3D > - unsafe { bindings::devm_add_action(dev.as_raw(), Some(inner.= callback), data as _) }; > + let ret =3D unsafe { > + bindings::devm_add_action(dev.as_raw(), Some(inner.callback)= , data.cast_mut().cast()) > + }; > > if ret !=3D 0 { > // SAFETY: We just created another reference to `inner` in o= rder to pass it to > @@ -127,7 +128,7 @@ fn new(dev: &Device, data: T, flags: Flags) ->= Result> > } > > fn as_ptr(&self) -> *const Self { > - self as _ > + self > } > > fn remove_action(this: &Arc) { > diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs > index 666bf2d64f9a..8e317005decd 100644 > --- a/rust/kernel/dma.rs > +++ b/rust/kernel/dma.rs > @@ -38,7 +38,7 @@ > impl Attrs { > /// Get the raw representation of this attribute. > pub(crate) fn as_raw(self) -> crate::ffi::c_ulong { > - self.0 as _ > + self.0 as crate::ffi::c_ulong > } > > /// Check whether `flags` is contained in `self`. > diff --git a/rust/kernel/drm/device.rs b/rust/kernel/drm/device.rs > index ef66deb7ce23..b7ee3c464a12 100644 > --- a/rust/kernel/drm/device.rs > +++ b/rust/kernel/drm/device.rs > @@ -89,7 +89,7 @@ impl Device { > driver_features: drm::driver::FEAT_GEM, > ioctls: T::IOCTLS.as_ptr(), > num_ioctls: T::IOCTLS.len() as i32, > - fops: &Self::GEM_FOPS as _, > + fops: &Self::GEM_FOPS, > }; > > const GEM_FOPS: bindings::file_operations =3D drm::gem::create_fops(= ); > diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs > index afcb00cb6a75..fd7a8b759437 100644 > --- a/rust/kernel/error.rs > +++ b/rust/kernel/error.rs > @@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_st= atus_t { > /// Returns the error encoded as a pointer. > pub fn to_ptr(self) -> *mut T { > // SAFETY: `self.0` is a valid error due to its invariant. > - unsafe { bindings::ERR_PTR(self.0.get() as _).cast() } > + unsafe { bindings::ERR_PTR(self.0.get() as isize).cast() } > } > > /// Returns a string representing the error, if one exists. > diff --git a/rust/kernel/io.rs b/rust/kernel/io.rs > index 72d80a6f131e..c08de4121637 100644 > --- a/rust/kernel/io.rs > +++ b/rust/kernel/io.rs > @@ -5,7 +5,7 @@ > //! C header: [`include/asm-generic/io.h`](srctree/include/asm-generic/i= o.h) > > use crate::error::{code::EINVAL, Result}; > -use crate::{bindings, build_assert}; > +use crate::{bindings, build_assert, ffi::c_void}; > > /// Raw representation of an MMIO region. > /// > @@ -56,7 +56,7 @@ pub fn maxsize(&self) -> usize { > /// # Examples > /// > /// ```no_run > -/// # use kernel::{bindings, io::{Io, IoRaw}}; > +/// # use kernel::{bindings, ffi::c_void, io::{Io, IoRaw}}; > /// # use core::ops::Deref; > /// > /// // See also [`pci::Bar`] for a real example. > @@ -70,19 +70,19 @@ pub fn maxsize(&self) -> usize { > /// unsafe fn new(paddr: usize) -> Result{ > /// // SAFETY: By the safety requirements of this function [`pad= dr`, `paddr` + `SIZE`) is > /// // valid for `ioremap`. > -/// let addr =3D unsafe { bindings::ioremap(paddr as _, SIZE as = _) }; > +/// let addr =3D unsafe { bindings::ioremap(paddr as bindings::p= hys_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 Drop for IoMem { > /// fn drop(&mut self) { > /// // SAFETY: `self.0.addr()` is guaranteed to be properly mapp= ed by `Self::new`. > -/// unsafe { bindings::iounmap(self.0.addr() as _); }; > +/// unsafe { bindings::iounmap(self.0.addr() as *mut c_void); }; > /// } > /// } > /// > @@ -119,7 +119,7 @@ pub fn $name(&self, offset: usize) -> $type_name { > let addr =3D self.io_addr_assert::<$type_name>(offset); > > // SAFETY: By the type invariant `addr` is a valid address f= or MMIO operations. > - unsafe { bindings::$c_fn(addr as _) } > + unsafe { bindings::$c_fn(addr as *const c_void) } > } > > /// Read IO data from a given offset. > @@ -131,7 +131,7 @@ pub fn $try_name(&self, offset: usize) -> Result<$typ= e_name> { > let addr =3D self.io_addr::<$type_name>(offset)?; > > // SAFETY: By the type invariant `addr` is a valid address f= or MMIO operations. > - Ok(unsafe { bindings::$c_fn(addr as _) }) > + Ok(unsafe { bindings::$c_fn(addr as *const c_void) }) > } > }; > } > @@ -148,7 +148,7 @@ pub fn $name(&self, value: $type_name, offset: usize)= { > let addr =3D self.io_addr_assert::<$type_name>(offset); > > // SAFETY: By the type invariant `addr` is a valid address f= or MMIO operations. > - unsafe { bindings::$c_fn(value, addr as _, ) } > + unsafe { bindings::$c_fn(value, addr as *mut c_void) } > } > > /// Write IO data from a given offset. > @@ -160,7 +160,7 @@ pub fn $try_name(&self, value: $type_name, offset: us= ize) -> Result { > let addr =3D self.io_addr::<$type_name>(offset)?; > > // SAFETY: By the type invariant `addr` is a valid address f= or MMIO operations. > - unsafe { bindings::$c_fn(value, addr as _) } > + unsafe { bindings::$c_fn(value, addr as *mut c_void) } > Ok(()) > } > }; > diff --git a/rust/kernel/miscdevice.rs b/rust/kernel/miscdevice.rs > index 939278bc7b03..288f40e79906 100644 > --- a/rust/kernel/miscdevice.rs > +++ b/rust/kernel/miscdevice.rs > @@ -34,7 +34,7 @@ impl MiscDeviceOptions { > pub const fn into_raw(self) -> bindings::miscdevice { > // SAFETY: All zeros is valid for this C type. > let mut result: bindings::miscdevice =3D unsafe { MaybeUninit::z= eroed().assume_init() }; > - result.minor =3D bindings::MISC_DYNAMIC_MINOR as _; > + result.minor =3D bindings::MISC_DYNAMIC_MINOR as ffi::c_int; > result.name =3D self.name.as_char_ptr(); > result.fops =3D MiscdeviceVTable::::build(); > result > diff --git a/rust/kernel/mm/virt.rs b/rust/kernel/mm/virt.rs > index 31803674aecc..6086ca981b06 100644 > --- a/rust/kernel/mm/virt.rs > +++ b/rust/kernel/mm/virt.rs > @@ -392,80 +392,80 @@ pub mod flags { > use crate::bindings; > > /// No flags are set. > - pub const NONE: vm_flags_t =3D bindings::VM_NONE as _; > + pub const NONE: vm_flags_t =3D bindings::VM_NONE as vm_flags_t; > > /// Mapping allows reads. > - pub const READ: vm_flags_t =3D bindings::VM_READ as _; > + pub const READ: vm_flags_t =3D bindings::VM_READ as vm_flags_t; > > /// Mapping allows writes. > - pub const WRITE: vm_flags_t =3D bindings::VM_WRITE as _; > + pub const WRITE: vm_flags_t =3D bindings::VM_WRITE as vm_flags_t; > > /// Mapping allows execution. > - pub const EXEC: vm_flags_t =3D bindings::VM_EXEC as _; > + pub const EXEC: vm_flags_t =3D bindings::VM_EXEC as vm_flags_t; > > /// Mapping is shared. > - pub const SHARED: vm_flags_t =3D bindings::VM_SHARED as _; > + pub const SHARED: vm_flags_t =3D bindings::VM_SHARED as vm_flags_t; > > /// Mapping may be updated to allow reads. > - pub const MAYREAD: vm_flags_t =3D bindings::VM_MAYREAD as _; > + pub const MAYREAD: vm_flags_t =3D bindings::VM_MAYREAD as vm_flags_t= ; > > /// Mapping may be updated to allow writes. > - pub const MAYWRITE: vm_flags_t =3D bindings::VM_MAYWRITE as _; > + pub const MAYWRITE: vm_flags_t =3D bindings::VM_MAYWRITE as vm_flags= _t; > > /// Mapping may be updated to allow execution. > - pub const MAYEXEC: vm_flags_t =3D bindings::VM_MAYEXEC as _; > + pub const MAYEXEC: vm_flags_t =3D bindings::VM_MAYEXEC as vm_flags_t= ; > > /// Mapping may be updated to be shared. > - pub const MAYSHARE: vm_flags_t =3D bindings::VM_MAYSHARE as _; > + pub const MAYSHARE: vm_flags_t =3D bindings::VM_MAYSHARE as vm_flags= _t; > > /// Page-ranges managed without `struct page`, just pure PFN. > - pub const PFNMAP: vm_flags_t =3D bindings::VM_PFNMAP as _; > + pub const PFNMAP: vm_flags_t =3D bindings::VM_PFNMAP as vm_flags_t; > > /// Memory mapped I/O or similar. > - pub const IO: vm_flags_t =3D bindings::VM_IO as _; > + pub const IO: vm_flags_t =3D bindings::VM_IO as vm_flags_t; > > /// Do not copy this vma on fork. > - pub const DONTCOPY: vm_flags_t =3D bindings::VM_DONTCOPY as _; > + pub const DONTCOPY: vm_flags_t =3D bindings::VM_DONTCOPY as vm_flags= _t; > > /// Cannot expand with mremap(). > - pub const DONTEXPAND: vm_flags_t =3D bindings::VM_DONTEXPAND as _; > + pub const DONTEXPAND: vm_flags_t =3D bindings::VM_DONTEXPAND as vm_f= lags_t; > > /// Lock the pages covered when they are faulted in. > - pub const LOCKONFAULT: vm_flags_t =3D bindings::VM_LOCKONFAULT as _; > + pub const LOCKONFAULT: vm_flags_t =3D bindings::VM_LOCKONFAULT as vm= _flags_t; > > /// Is a VM accounted object. > - pub const ACCOUNT: vm_flags_t =3D bindings::VM_ACCOUNT as _; > + pub const ACCOUNT: vm_flags_t =3D bindings::VM_ACCOUNT as vm_flags_t= ; > > /// Should the VM suppress accounting. > - pub const NORESERVE: vm_flags_t =3D bindings::VM_NORESERVE as _; > + pub const NORESERVE: vm_flags_t =3D bindings::VM_NORESERVE as vm_fla= gs_t; > > /// Huge TLB Page VM. > - pub const HUGETLB: vm_flags_t =3D bindings::VM_HUGETLB as _; > + pub const HUGETLB: vm_flags_t =3D bindings::VM_HUGETLB as vm_flags_t= ; > > /// Synchronous page faults. (DAX-specific) > - pub const SYNC: vm_flags_t =3D bindings::VM_SYNC as _; > + pub const SYNC: vm_flags_t =3D bindings::VM_SYNC as vm_flags_t; > > /// Architecture-specific flag. > - pub const ARCH_1: vm_flags_t =3D bindings::VM_ARCH_1 as _; > + pub const ARCH_1: vm_flags_t =3D bindings::VM_ARCH_1 as vm_flags_t; > > /// Wipe VMA contents in child on fork. > - pub const WIPEONFORK: vm_flags_t =3D bindings::VM_WIPEONFORK as _; > + pub const WIPEONFORK: vm_flags_t =3D bindings::VM_WIPEONFORK as vm_f= lags_t; > > /// Do not include in the core dump. > - pub const DONTDUMP: vm_flags_t =3D bindings::VM_DONTDUMP as _; > + pub const DONTDUMP: vm_flags_t =3D bindings::VM_DONTDUMP as vm_flags= _t; > > /// Not soft dirty clean area. > - pub const SOFTDIRTY: vm_flags_t =3D bindings::VM_SOFTDIRTY as _; > + pub const SOFTDIRTY: vm_flags_t =3D bindings::VM_SOFTDIRTY as vm_fla= gs_t; > > /// Can contain `struct page` and pure PFN pages. > - pub const MIXEDMAP: vm_flags_t =3D bindings::VM_MIXEDMAP as _; > + pub const MIXEDMAP: vm_flags_t =3D bindings::VM_MIXEDMAP as vm_flags= _t; > > /// MADV_HUGEPAGE marked this vma. > - pub const HUGEPAGE: vm_flags_t =3D bindings::VM_HUGEPAGE as _; > + pub const HUGEPAGE: vm_flags_t =3D bindings::VM_HUGEPAGE as vm_flags= _t; > > /// MADV_NOHUGEPAGE marked this vma. > - pub const NOHUGEPAGE: vm_flags_t =3D bindings::VM_NOHUGEPAGE as _; > + pub const NOHUGEPAGE: vm_flags_t =3D bindings::VM_NOHUGEPAGE as vm_f= lags_t; > > /// KSM may merge identical pages. > - pub const MERGEABLE: vm_flags_t =3D bindings::VM_MERGEABLE as _; > + pub const MERGEABLE: vm_flags_t =3D bindings::VM_MERGEABLE as vm_fla= gs_t; > } > diff --git a/rust/kernel/of.rs b/rust/kernel/of.rs > index 04f2d8ef29cb..40d1bd13682c 100644 > --- a/rust/kernel/of.rs > +++ b/rust/kernel/of.rs > @@ -22,7 +22,7 @@ unsafe impl RawDeviceId for DeviceId { > const DRIVER_DATA_OFFSET: usize =3D core::mem::offset_of!(bindings::= of_device_id, data); > > fn index(&self) -> usize { > - self.0.data as _ > + self.0.data as usize > } > } > > @@ -34,10 +34,10 @@ pub const fn new(compatible: &'static CStr) -> Self { > // SAFETY: FFI type is valid to be zero-initialized. > let mut of: bindings::of_device_id =3D unsafe { core::mem::zeroe= d() }; > > - // TODO: Use `clone_from_slice` once the corresponding types do = match. > + // TODO: Use `copy_from_slice` once stabilized for `const`. > let mut i =3D 0; > while i < src.len() { > - of.compatible[i] =3D src[i] as _; > + of.compatible[i] =3D src[i]; > i +=3D 1; > } > > diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs > index 33ae0bdc433d..f6b19764ad17 100644 > --- a/rust/kernel/pci.rs > +++ b/rust/kernel/pci.rs > @@ -171,7 +171,7 @@ unsafe impl RawDeviceId for DeviceId { > const DRIVER_DATA_OFFSET: usize =3D core::mem::offset_of!(bindings::= pci_device_id, driver_data); > > fn index(&self) -> usize { > - self.0.driver_data as _ > + self.0.driver_data > } > } > > @@ -206,7 +206,10 @@ macro_rules! pci_device_table { > /// MODULE_PCI_TABLE, > /// ::IdInfo, > /// [ > -/// (pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_REDHAT, bind= ings::PCI_ANY_ID as _), ()) > +/// ( > +/// pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_REDHAT, b= indings::PCI_ANY_ID as u32), > +/// (), > +/// ) > /// ] > /// ); > /// > @@ -330,7 +333,7 @@ unsafe fn do_release(pdev: &Device, ioptr: usize, num= : i32) { > // `ioptr` is valid by the safety requirements. > // `num` is valid by the safety requirements. > unsafe { > - bindings::pci_iounmap(pdev.as_raw(), ioptr as _); > + bindings::pci_iounmap(pdev.as_raw(), ioptr as *mut kernel::f= fi::c_void); > bindings::pci_release_region(pdev.as_raw(), num); > } > } > diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs > index 6a3cb607b332..43597eb7c5c1 100644 > --- a/rust/kernel/str.rs > +++ b/rust/kernel/str.rs > @@ -728,9 +728,9 @@ fn new() -> Self { > pub(crate) unsafe fn from_ptrs(pos: *mut u8, end: *mut u8) -> Self { > // INVARIANT: The safety requirements guarantee the type invaria= nts. > Self { > - beg: pos as _, > - pos: pos as _, > - end: end as _, > + beg: pos as usize, > + pos: pos as usize, > + end: end as usize, > } > } > > @@ -755,7 +755,7 @@ pub(crate) unsafe fn from_buffer(buf: *mut u8, len: u= size) -> Self { > /// > /// N.B. It may point to invalid memory. > pub(crate) fn pos(&self) -> *mut u8 { > - self.pos as _ > + self.pos as *mut u8 > } > > /// Returns the number of bytes written to the formatter. > diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs > index de61374e36bd..89e5c2560eec 100644 > --- a/rust/kernel/workqueue.rs > +++ b/rust/kernel/workqueue.rs > @@ -198,7 +198,7 @@ pub fn enqueue(&self, w: W) -> W::E= nqueueOutput > unsafe { > w.__enqueue(move |work_ptr| { > bindings::queue_work_on( > - bindings::wq_misc_consts_WORK_CPU_UNBOUND as _, > + bindings::wq_misc_consts_WORK_CPU_UNBOUND as ffi::c_= int, > queue_ptr, > work_ptr, > ) > > -- > 2.49.0 >