[v3,1/3] rust: block: simplify Result<()> in validate_block_size return

Commit Message

Manas via B4 Relay Nov. 18, 2024, 2:36 p.m. UTC

From: Manas <[e-mail]>

`Result` is used in place of `Result<()>` because the default type
parameters are unit `()` and `Error` types, which are automatically
inferred. Thus keep the usage consistent throughout codebase.

Suggested-by: Miguel Ojeda <[e-mail]>
Link: https://github.com/Rust-for-Linux/linux/issues/1128
Signed-off-by: Manas <[e-mail]>
---
 rust/kernel/block/mq/gen_disk.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Miguel Ojeda Nov. 18, 2024, 4:05 p.m. UTC | #1

On Mon, Nov 18, 2024 at 3:37 PM Manas via B4 Relay
<[e-mail]> wrote:
>
> From: Manas <[e-mail]>
>
> `Result` is used in place of `Result<()>` because the default type
> parameters are unit `()` and `Error` types, which are automatically
> inferred. Thus keep the usage consistent throughout codebase.
>
> Suggested-by: Miguel Ojeda <[e-mail]>
> Link: https://github.com/Rust-for-Linux/linux/issues/1128
> Signed-off-by: Manas <[e-mail]>

If block wants to pick this one up independently:

Reviewed-by: Miguel Ojeda <[e-mail]>

(Note: normally you would carry the review/tested tags you were given
in a previous version, unless you made significant changes)

Thanks!

Cheers,
Miguel

Jens Axboe Nov. 18, 2024, 4:10 p.m. UTC | #2

On 11/18/24 9:05 AM, Miguel Ojeda wrote:
> On Mon, Nov 18, 2024 at 3:37?PM Manas via B4 Relay
> <[e-mail]> wrote:
>>
>> From: Manas <[e-mail]>
>>
>> `Result` is used in place of `Result<()>` because the default type
>> parameters are unit `()` and `Error` types, which are automatically
>> inferred. Thus keep the usage consistent throughout codebase.
>>
>> Suggested-by: Miguel Ojeda <[e-mail]>
>> Link: https://github.com/Rust-for-Linux/linux/issues/1128
>> Signed-off-by: Manas <[e-mail]>
> 
> If block wants to pick this one up independently:
> 
> Reviewed-by: Miguel Ojeda <[e-mail]>

I can grab it.

Manas Nov. 18, 2024, 4:19 p.m. UTC | #3

On 18.11.2024 17:05, Miguel Ojeda wrote:
>On Mon, Nov 18, 2024 at 3:37 PM Manas via B4 Relay
><[e-mail]> wrote:
>>
>> From: Manas <[e-mail]>
>>
>> `Result` is used in place of `Result<()>` because the default type
>> parameters are unit `()` and `Error` types, which are automatically
>> inferred. Thus keep the usage consistent throughout codebase.
>>
>> Suggested-by: Miguel Ojeda <[e-mail]>
>> Link: https://github.com/Rust-for-Linux/linux/issues/1128
>> Signed-off-by: Manas <[e-mail]>
>
>If block wants to pick this one up independently:
>
>Reviewed-by: Miguel Ojeda <[e-mail]>
>
>(Note: normally you would carry the review/tested tags you were given
>in a previous version, unless you made significant changes)
Thanks. I will keep that in mind.

Patch

diff --git a/rust/kernel/block/mq/gen_disk.rs b/rust/kernel/block/mq/gen_disk.rs
index 708125dce96a934f32caab44d5e6cff14c4321a9..798c4ae0bdedd58221b5851a630c0e1052e0face 100644
--- a/rust/kernel/block/mq/gen_disk.rs
+++ b/rust/kernel/block/mq/gen_disk.rs
@@ -45,7 +45,7 @@  pub fn rotational(mut self, rotational: bool) -> Self {
 
     /// Validate block size by verifying that it is between 512 and `PAGE_SIZE`,
     /// and that it is a power of two.
-    fn validate_block_size(size: u32) -> Result<()> {
+    fn validate_block_size(size: u32) -> Result {
         if !(512..=bindings::PAGE_SIZE as u32).contains(&size) || !size.is_power_of_two() {
             Err(error::code::EINVAL)
         } else {