[PATCH] nvme: One function call less in nvme_update_disk_info()

From: Markus Elfring
Date: Fri Jul 05 2019 - 15:16:02 EST


From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri, 5 Jul 2019 21:08:12 +0200

Avoid an extra function call by using a ternary operator instead of
a conditional statement.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
drivers/nvme/host/core.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b2dd4e391f5c..73888195bdb2 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1650,10 +1650,7 @@ static void nvme_update_disk_info(struct gendisk *disk,
nvme_config_discard(disk, ns);
nvme_config_write_zeroes(disk, ns);

- if (id->nsattr & (1 << 0))
- set_disk_ro(disk, true);
- else
- set_disk_ro(disk, false);
+ set_disk_ro(disk, id->nsattr & (1 << 0) ? true : false);

blk_mq_unfreeze_queue(disk->queue);
}
--
2.22.0