Using range and contains() method is just fancy shmancy way of writing
two comparisons which IMO is less readable.
Using range doesn't prevent any bugs because "=" in range can forgotten
just as easily in "<=" operator.
Also delete few comments of "increment i by 1" variety.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
---
rust/kernel/block/mq/gen_disk.rs | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
--- a/rust/kernel/block/mq/gen_disk.rs
+++ b/rust/kernel/block/mq/gen_disk.rs
@@ -43,21 +43,16 @@ pub fn rotational(mut self, rotational: bool) -> Self {
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<()> {
- if !(512..=bindings::PAGE_SIZE as u32).contains(&size) ||
!size.is_power_of_two() {
- Err(error::code::EINVAL)
- } else {
+ if 512 <= size && size <= bindings::PAGE_SIZE as u32 &&
size.is_power_of_two() {
Ok(())
+ } else {
+ Err(error::code::EINVAL)
}
}
/// Set the logical block size of the device to be built.
///
- /// This method will check that block size is a power of two and
between 512
- /// and 4096. If not, an error is returned and the block size is not set.
- ///
/// This is the smallest unit the storage device can address. It is
/// typically 4096 bytes.
pub fn logical_block_size(mut self, block_size: u32) -> Result<Self> {
@@ -68,9 +63,6 @@ pub fn logical_block_size(mut self, block_size: u32)
-> Result<Self> {
/// Set the physical block size of the device to be built.
///
- /// This method will check that block size is a power of two and
between 512
- /// and 4096. If not, an error is returned and the block size is not set.
- ///
/// This is the smallest unit a physical storage device can write
/// atomically. It is usually the same as the logical block size but may be
/// bigger. One example is SATA drives with 4096 byte physical block size
