On Fri, Feb 28, 2025 at 01:45:21PM +0100, Markus Elfring wrote:
> From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> Date: Fri, 28 Feb 2025 13:38:38 +0100
>
> Replace nested min() calls by single min3() call in two
> function implementations.
>
> This issue was transformed by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/nvme/host/fc.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index b9929a5a7f4e..6eed3ecdbaf6 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -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,
> --
> 2.48.1
>
Hi Markus,
I have already submitted a patch for this twice in the past:
4th Feb: <https://lore.kernel.org/all/20250204201256.117194-1-qasdev00@xxxxxxxxx/>
13th Feb: <https://lore.kernel.org/all/20250213221622.81457-1-qasdev00@xxxxxxxxx/>
>
