[PATCH] rust: error.rs: Remove dead_code marker and make from_err_=
From: Filipe Xavier
Date: Sat Sep 07 2024 - 08:50:33 EST
Remove dead_code annotation from from_err_ptr, from_result and to_ptr funct=
ions in error.rs file and change visibility to public, making it accessible=
outside the kernel crate(issue #1105).
Signed-off-by: Filipe Xavier <felipe_life@xxxxxxxx>
---
diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs
index 6f1587a2524e..ecfa6aa41034 100644
--- a/rust/kernel/error.rs
+++ b/rust/kernel/error.rs
@@ -133,8 +133,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_stat=
us_t {
}
/// Returns the error encoded as a pointer.
- #[allow(dead_code)]
- pub(crate) fn to_ptr<T>(self) -> *mut T {
+ pub fn to_ptr<T>(self) -> *mut T {
#[cfg_attr(target_pointer_width =3D "32", allow(clippy::useless_co=
nversion))]
// SAFETY: `self.0` is a valid error due to its invariant.
unsafe {
@@ -268,9 +267,7 @@ pub fn to_result(err: core::ffi::c_int) -> Result {
/// from_err_ptr(unsafe { bindings::devm_platform_ioremap_resource(pde=
v.to_ptr(), index) })
/// }
/// ```
-// TODO: Remove `dead_code` marker once an in-kernel client is available.
-#[allow(dead_code)]
-pub(crate) fn from_err_ptr<T>(ptr: *mut T) -> Result<*mut T> {
+pub fn from_err_ptr<T>(ptr: *mut T) -> Result<*mut T> {
// CAST: Casting a pointer to `*const core::ffi::c_void` is always val=
id.
let const_ptr: *const core::ffi::c_void =3D ptr.cast();
// SAFETY: The FFI function does not deref the pointer.
@@ -315,9 +312,7 @@ pub(crate) fn from_err_ptr<T>(ptr: *mut T) -> Result<*m=
ut T> {
/// })
/// }
/// ```
-// TODO: Remove `dead_code` marker once an in-kernel client is available.
-#[allow(dead_code)]
-pub(crate) fn from_result<T, F>(f: F) -> T
+pub fn from_result<T, F>(f: F) -> T
where
T: From<i16>,
F: FnOnce() -> Result<T>,
--_000_DM4PR14MB72760296911674F92C7A6C01E99F2DM4PR14MB7276namp_
Content-Type: text/html; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
<html>
<head>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Diso-8859-=
1">
<style type=3D"text/css" style=3D"display:none;"> P {margin-top:0;margin-bo=
ttom:0;} </style>
</head>
<body dir=3D"ltr">
<div style=3D"background-color: rgb(31, 31, 31);">
<div style=3D"line-height: 19px; white-space: pre; font-family: "Droid=
Sans Mono", "monospace", monospace; font-size: 14px; color:=
rgb(204, 204, 204);">
>From 93dc3be19450447a3a7090bd1dfb9f3daac3e8d2 Mon Sep 17 00:00:00 2001</div=
>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
From: Filipe Xavier <felipe_life@xxxxxxxx></div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
Date: Sat, 7 Sep 2024 14:50:33 +0200</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
Subject: [PATCH] rust: error.rs: Remove dead_code marker and make from_err_=
ptr, from_result and to_ptr public</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
<br>
</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
Remove dead_code annotation from from_err_ptr, from_result and to_ptr funct=
ions in error.rs file and change visibility to public, making it accessible=
outside the kernel crate(issue #1105).</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
<br>
</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
Signed-off-by: Filipe Xavier <felipe_life@xxxxxxxx></div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
---</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
index 6f1587a2524e..ecfa6aa41034 100644</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
--- a/rust/kernel/error.rs</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
+++ b/rust/kernel/error.rs</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
@@ -133,8 +133,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_s=
tatus_t {</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
}</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
/// Returns the error encoded as a pointer.</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
- #[allow(dead_code)]</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
- pub(crate) fn to_ptr<T>(self) -> *mut T {</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
+ pub fn to_ptr<T>(self) -> *mut T {</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
#[cfg_attr(target_pointer_width =3D "=
;32", allow(clippy::useless_conversion))]</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
// SAFETY: `self.0` is a valid error due =
to its invariant.</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
unsafe {</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
@@ -268,9 +267,7 @@ pub fn to_result(err: core::ffi::c_int) -> Result {<=
/div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
/// from_err_ptr(unsafe { bindings::devm_platform_iorem=
ap_resource(pdev.to_ptr(), index) })</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
/// }</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
/// ```</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
-// TODO: Remove `dead_code` marker once an in-kernel client is available.<=
/div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
-#[allow(dead_code)]</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
-pub(crate) fn from_err_ptr<T>(ptr: *mut T) -> Result<*mut T>=
; {</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
+pub fn from_err_ptr<T>(ptr: *mut T) -> Result<*mut T> {</di=
v>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
// CAST: Casting a pointer to `*const core::ffi::c_void=
` is always valid.</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
let const_ptr: *const core::ffi::c_void =3D ptr.cast();=
</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
// SAFETY: The FFI function does not deref the pointer.=
</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
@@ -315,9 +312,7 @@ pub(crate) fn from_err_ptr<T>(ptr: *mut T) -> =
Result<*mut T> {</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
/// })</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
/// }</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
/// ```</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
-// TODO: Remove `dead_code` marker once an in-kernel client is available.<=
/div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
-#[allow(dead_code)]</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
-pub(crate) fn from_result<T, F>(f: F) -> T</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
+pub fn from_result<T, F>(f: F) -> T</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
where</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
T: From<i16>,</div>
<div style=3D"font-family: "Droid Sans Mono", "monospace&quo=
t;, monospace; font-size: 14px; color: rgb(204, 204, 204);">
F: FnOnce() -> Result<T>,</div>
</div>
</body>
</html>
--_000_DM4PR14MB72760296911674F92C7A6C01E99F2DM4PR14MB7276namp_--
--_004_DM4PR14MB72760296911674F92C7A6C01E99F2DM4PR14MB7276namp_
Content-Type: text/x-patch;
name="0001-make-public-functions-on-error-rs.patch"
Content-Description: 0001-make-public-functions-on-error-rs.patch
Content-Disposition: attachment;
filename="0001-make-public-functions-on-error-rs.patch"; size=2029;
creation-date="Sat, 07 Sep 2024 18:18:55 GMT";
modification-date="Sat, 07 Sep 2024 18:19:00 GMT"
Content-Transfer-Encoding: base64
RnJvbSA5M2RjM2JlMTk0NTA0NDdhM2E3MDkwYmQxZGZiOWYzZGFhYzNlOGQyIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBGaWxpcGUgWGF2aWVyIDxmZWxpcGVfbGlmZUBsaXZlLmNvbT4K
RGF0ZTogU2F0LCA3IFNlcCAyMDI0IDE0OjUwOjMzICswMjAwClN1YmplY3Q6IFtQQVRDSF0gcnVz
dDogZXJyb3IucnM6IFJlbW92ZSBkZWFkX2NvZGUgbWFya2VyIGFuZCBtYWtlIGZyb21fZXJyX3B0
ciwgZnJvbV9yZXN1bHQgYW5kIHRvX3B0ciBwdWJsaWMKClJlbW92ZSBkZWFkX2NvZGUgYW5ub3Rh
dGlvbiBmcm9tIGZyb21fZXJyX3B0ciwgZnJvbV9yZXN1bHQgYW5kIHRvX3B0ciBmdW5jdGlvbnMg
aW4gZXJyb3IucnMgZmlsZSBhbmQgY2hhbmdlIHZpc2liaWxpdHkgdG8gcHVibGljLCBtYWtpbmcg
aXQgYWNjZXNzaWJsZSBvdXRzaWRlIHRoZSBrZXJuZWwgY3JhdGUoaXNzdWUgIzExMDUpLgoKU2ln
bmVkLW9mZi1ieTogRmlsaXBlIFhhdmllciA8ZmVsaXBlX2xpZmVAbGl2ZS5jb20+Ci0tLQpkaWZm
IC0tZ2l0IGEvcnVzdC9rZXJuZWwvZXJyb3IucnMgYi9ydXN0L2tlcm5lbC9lcnJvci5ycwppbmRl
eCA2ZjE1ODdhMjUyNGUuLmVjZmE2YWE0MTAzNCAxMDA2NDQKLS0tIGEvcnVzdC9rZXJuZWwvZXJy
b3IucnMKKysrIGIvcnVzdC9rZXJuZWwvZXJyb3IucnMKQEAgLTEzMyw4ICsxMzMsNyBAQCBwdWIo
Y3JhdGUpIGZuIHRvX2Jsa19zdGF0dXMoc2VsZikgLT4gYmluZGluZ3M6OmJsa19zdGF0dXNfdCB7
CiAgICAgfQogCiAgICAgLy8vIFJldHVybnMgdGhlIGVycm9yIGVuY29kZWQgYXMgYSBwb2ludGVy
LgotICAgICNbYWxsb3coZGVhZF9jb2RlKV0KLSAgICBwdWIoY3JhdGUpIGZuIHRvX3B0cjxUPihz
ZWxmKSAtPiAqbXV0IFQgeworICAgIHB1YiBmbiB0b19wdHI8VD4oc2VsZikgLT4gKm11dCBUIHsK
ICAgICAgICAgI1tjZmdfYXR0cih0YXJnZXRfcG9pbnRlcl93aWR0aCA9ICIzMiIsIGFsbG93KGNs
aXBweTo6dXNlbGVzc19jb252ZXJzaW9uKSldCiAgICAgICAgIC8vIFNBRkVUWTogYHNlbGYuMGAg
aXMgYSB2YWxpZCBlcnJvciBkdWUgdG8gaXRzIGludmFyaWFudC4KICAgICAgICAgdW5zYWZlIHsK
QEAgLTI2OCw5ICsyNjcsNyBAQCBwdWIgZm4gdG9fcmVzdWx0KGVycjogY29yZTo6ZmZpOjpjX2lu
dCkgLT4gUmVzdWx0IHsKIC8vLyAgICAgZnJvbV9lcnJfcHRyKHVuc2FmZSB7IGJpbmRpbmdzOjpk
ZXZtX3BsYXRmb3JtX2lvcmVtYXBfcmVzb3VyY2UocGRldi50b19wdHIoKSwgaW5kZXgpIH0pCiAv
Ly8gfQogLy8vIGBgYAotLy8gVE9ETzogUmVtb3ZlIGBkZWFkX2NvZGVgIG1hcmtlciBvbmNlIGFu
IGluLWtlcm5lbCBjbGllbnQgaXMgYXZhaWxhYmxlLgotI1thbGxvdyhkZWFkX2NvZGUpXQotcHVi
KGNyYXRlKSBmbiBmcm9tX2Vycl9wdHI8VD4ocHRyOiAqbXV0IFQpIC0+IFJlc3VsdDwqbXV0IFQ+
IHsKK3B1YiBmbiBmcm9tX2Vycl9wdHI8VD4ocHRyOiAqbXV0IFQpIC0+IFJlc3VsdDwqbXV0IFQ+
IHsKICAgICAvLyBDQVNUOiBDYXN0aW5nIGEgcG9pbnRlciB0byBgKmNvbnN0IGNvcmU6OmZmaTo6
Y192b2lkYCBpcyBhbHdheXMgdmFsaWQuCiAgICAgbGV0IGNvbnN0X3B0cjogKmNvbnN0IGNvcmU6
OmZmaTo6Y192b2lkID0gcHRyLmNhc3QoKTsKICAgICAvLyBTQUZFVFk6IFRoZSBGRkkgZnVuY3Rp
b24gZG9lcyBub3QgZGVyZWYgdGhlIHBvaW50ZXIuCkBAIC0zMTUsOSArMzEyLDcgQEAgcHViKGNy
YXRlKSBmbiBmcm9tX2Vycl9wdHI8VD4ocHRyOiAqbXV0IFQpIC0+IFJlc3VsdDwqbXV0IFQ+IHsK
IC8vLyAgICAgfSkKIC8vLyB9CiAvLy8gYGBgCi0vLyBUT0RPOiBSZW1vdmUgYGRlYWRfY29kZWAg
bWFya2VyIG9uY2UgYW4gaW4ta2VybmVsIGNsaWVudCBpcyBhdmFpbGFibGUuCi0jW2FsbG93KGRl
YWRfY29kZSldCi1wdWIoY3JhdGUpIGZuIGZyb21fcmVzdWx0PFQsIEY+KGY6IEYpIC0+IFQKK3B1
YiBmbiBmcm9tX3Jlc3VsdDxULCBGPihmOiBGKSAtPiBUCiB3aGVyZQogICAgIFQ6IEZyb208aTE2
PiwKICAgICBGOiBGbk9uY2UoKSAtPiBSZXN1bHQ8VD4sCg==
--_004_DM4PR14MB72760296911674F92C7A6C01E99F2DM4PR14MB7276namp_--