i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme_disk & virtio_block: Remove unneeded log2.

Browse Source 
It was used, but then the result discarded. We have a log2()
in kernel/util/BitUtils.h anyway, so if it is really needed,
that should be used instead.
This commit is contained in:
Augustin Cavalier
2021-10-27 12:40:31 -04:00
parent 6bef34f853
commit dab646ac9a
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
-20
View File
@@ -132,20 +132,6 @@ get_geometry(nvme_disk_handle* handle, device_geometry* geometry)
} }
static int
log2(uint32 x)
{
int y;
for (y = 31; y >= 0; --y) {
if (x == ((uint32)1 << y))
break;
}
return y;
}
static void static void
nvme_disk_set_capacity(nvme_disk_driver_info* info, uint64 capacity, nvme_disk_set_capacity(nvme_disk_driver_info* info, uint64 capacity,
uint32 blockSize) uint32 blockSize)
@@ -153,12 +139,6 @@ nvme_disk_set_capacity(nvme_disk_driver_info* info, uint64 capacity,
TRACE("set_capacity(device = %p, capacity = %" B_PRIu64 ", blockSize = %" B_PRIu32 ")\n", TRACE("set_capacity(device = %p, capacity = %" B_PRIu64 ", blockSize = %" B_PRIu32 ")\n",
info, capacity, blockSize); info, capacity, blockSize);
// get log2, if possible
uint32 blockShift = log2(blockSize);
if ((1UL << blockShift) != blockSize)
blockShift = 0;
info->capacity = capacity; info->capacity = capacity;
info->block_size = blockSize; info->block_size = blockSize;
} }
src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp
-20
View File
@@ -146,20 +146,6 @@ get_geometry(virtio_block_handle* handle, device_geometry* geometry)
} }
static int
log2(uint32 x)
{
int y;
for (y = 31; y >= 0; --y) {
if (x == ((uint32)1 << y))
break;
}
return y;
}
static void static void
virtio_block_config_callback(void* driverCookie) virtio_block_config_callback(void* driverCookie)
{ {
@@ -498,12 +484,6 @@ virtio_block_set_capacity(virtio_block_driver_info* info, uint64 capacity,
TRACE("set_capacity(device = %p, capacity = %Ld, blockSize = %ld)\n", TRACE("set_capacity(device = %p, capacity = %Ld, blockSize = %ld)\n",
info, capacity, blockSize); info, capacity, blockSize);
// get log2, if possible
uint32 blockShift = log2(blockSize);
if ((1UL << blockShift) != blockSize)
blockShift = 0;
info->capacity = capacity; info->capacity = capacity;
if (info->block_size != blockSize) { if (info->block_size != blockSize) {