Received-SPF: pass (google.com: domain of linux-kernel+bounces-27554-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Valentin Obst <kernel@valentinobst.de>
To: Miguel Ojeda <ojeda@kernel.org>,
	Alex Gaynor <alex.gaynor@gmail.com>,
	Wedson Almeida Filho <wedsonaf@gmail.com>
Cc: Boqun Feng <boqun.feng@gmail.com>,
	Gary Guo <gary@garyguo.net>,
	=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= <bjorn3_gh@protonmail.com>,
	Benno Lossin <benno.lossin@proton.me>,
	Andreas Hindborg <a.hindborg@samsung.com>,
	Alice Ryhl <aliceryhl@google.com>,
	rust-for-linux@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Valentin Obst <kernel@valentinobst.de>
Subject: [PATCH 02/13] rust: error: move unsafe block into function call
Date: Tue, 16 Jan 2024 17:01:27 +0100
Message-ID: <20240116160141.165951-3-kernel@valentinobst.de>
In-Reply-To: <20240116160141.165951-1-kernel@valentinobst.de>
References: <20240116160141.165951-1-kernel@valentinobst.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
UI-OutboundReport: notjunk:1;M01:P0:vfE4pxrJzRA=;T6tpxL0/72IvcsGh63L8yn0ff9A
 en6NnaOJkZzpWwHGTP1pOi+MM9TVMmCJpOz/NvS6h9DdGFy03ClTT+MorjaXDpdw6NIx4JVlP
 TOT+8ZY8pu/9PPwvsKOtMvzv72GjDAio2dYXQ4el/F+l1RVOnNbGbpWc5tAD8NpMrdW4+IjIw
 98lJzIPkODHjOZ2GC1MflMf+YpcNBQsFQ1ruzzRIAHAC/rLjzXqSXMVCYXtnPeJKaVqIMX6K4
 8xB5zdZHCBLm0cwUFufFVtQU1vWxpGUp1xr8a2CUsdVe6D+QqQVZDHupPYPXL/w9DrnKAHk2g
 eqyque/ZqUQBQ0Q4V26zxjcOW0Ct1nHDrY06SZJ7JhYEKaf7aCE/p9zdxNcywEzXq2p36UKVo
 ItqQa+MwHZbrG6AZreYne3g4JTtkAaC9M4sWMyiFWpKvXe9y54Ituvw3x29n5QZMtNll3Ezge
 aJmBY4XulN5wa+76YGhaXeLmsuU6plPyYWycoBgG8u2NuHmjoGBEVQLEzeZllweWrRSA7/BOq
 WbORVUU/pL461S8YUOrSbwTYqaMEdjPLDLvRQju7qDGf478O8XMC9LW5MPW6/yEJs+I5CuQp1
 HJeax00F/Me8wooTp9AG24DEMVjBINVSxZy/Aco90gowOcNwjG/SAh4siOstSjALc98kIbG2h
 r419+NVaYPMCGcM6nSHcf/5OW59og0kk7HyruPO96KcCyDGy8PKbQIyg0SlDE8K8Fu1ACM5Rp
 vTTfk9dq2KJYjG/PeBxM3CAKHgOwJC9VWvsvujFS6bcPBZ2e19K3AfwqJBDd14XptY7Oiqinl
 OcOZS0NE1nLQe3YtVIbn/KkuaGkc7EqApKXYGscg9nzHTFd/FYGLNCo05DCBs5kw64+BGScW3
 h6skzvWUQCoZaRPif6kgfLjDRyCZuQU5Jgd0=

The `from_err_ptr` function is safe. There is no need for the call to it
to be inside the unsafe block.

Signed-off-by: Valentin Obst <kernel@valentinobst.de>
---
 rust/kernel/error.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs
index 4f0c1edd63b7..6f6676bc0eb9 100644
--- a/rust/kernel/error.rs
+++ b/rust/kernel/error.rs
@@ -265,12 +265,7 @@ pub fn to_result(err: core::ffi::c_int) -> Result {
 ///     index: u32,
 /// ) -> Result<*mut core::ffi::c_void> {
 ///     // SAFETY: FFI call.
-///     unsafe {
-///         from_err_ptr(bindings::devm_platform_ioremap_resource(
-///             pdev.to_ptr(),
-///             index,
-///         ))
-///     }
+///     from_err_ptr(unsafe { bindings::devm_platform_ioremap_resource(pdev.to_ptr(), index) })
 /// }
 /// ```
 // TODO: Remove `dead_code` marker once an in-kernel client is available.
-- 
2.43.0