nvme-fc: Simplify minimum determination in two functions
Subsystems (2)
Quoted 38 lines · Markus Elfring
From: Markus Elfring <[email protected]>
Date: Fri, 28 Feb 2025 13:38:38 +0100Replace nested
min()calls by singlemin3()call in two function implementations.This issue was transformed by using the Coccinelle software.
Signed-off-by Markus Elfring <[email protected]>--- drivers/nvme/host/fc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/nvme/host/fc.c +2
-5@@ -2858,8 +2858,7 @@ nvme_fc_create_io_queues(struct nvme_fc_ctrl *ctrl)unsigned int nr_io_queues;int ret; - nr_io_queues =min (min (opts->nr_io_queues,num_online_cpus ()), - ctrl->lport->ops->max_hw_queues); + nr_io_queues =min3 (opts->nr_io_queues,num_online_cpus (), ctrl->lport->ops->max_hw_queues); ret =nvme_set_queue_count (&ctrl->ctrl, &nr_io_queues);if (ret) { dev_info(ctrl->ctrl.device,@@ -2912,8 +2911,7 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)unsigned int nr_io_queues;int ret; - nr_io_queues =min (min (opts->nr_io_queues,num_online_cpus ()), - ctrl->lport->ops->max_hw_queues); + nr_io_queues =min3 (opts->nr_io_queues,num_online_cpus (), ctrl->lport->ops->max_hw_queues); ret =nvme_set_queue_count (&ctrl->ctrl, &nr_io_queues);if (ret) { dev_info(ctrl->ctrl.device, --
Quoted 2 lines
2.48.1
Hi Markus,
I have already submitted a patch for this twice in the past:
4th Feb: <https://lore.kernel.org/all/[email protected]/>
13th Feb: <https://lore.kernel.org/all/[email protected]/>
Quoted 1 line
Quoted 1 line
I have already submitted a patch for this twice in the past:
Thanks for the reminder.
I am curious then which change variant will be integrated finally.
Regards,
Markus