[v1] scsi: qla2xxx: Use secs_to_jiffies() instead of msecs_to_jiffies()

[PATCH RESEND] scsi: qla2xxx: Use secs_to_jiffies() instead of msecs_to_jiffies()

Posted by Thorsten Blum 1 month ago

Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling
'ratov_j' to milliseconds.

No functional changes intended.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 drivers/scsi/qla2xxx/qla_bsg.c | 4 ++--
 drivers/scsi/qla2xxx/qla_os.c  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 10431a67d202..ccfc2d26dd37 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -3106,8 +3106,8 @@ static bool qla_bsg_found(struct qla_qpair *qpair, struct bsg_job *bsg_job)
 	switch (rval) {
 	case QLA_SUCCESS:
 		/* Wait for the command completion. */
-		ratov_j = ha->r_a_tov / 10 * 4 * 1000;
-		ratov_j = msecs_to_jiffies(ratov_j);
+		ratov_j = ha->r_a_tov / 10 * 4;
+		ratov_j = secs_to_jiffies(ratov_j);
 
 		if (!wait_for_completion_timeout(&comp, ratov_j)) {
 			ql_log(ql_log_info, vha, 0x7089,
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index d4b484c0fd9d..9a2f328200ab 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1291,8 +1291,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
 	       "Abort command mbx cmd=%p, rval=%x.\n", cmd, rval);
 
 	/* Wait for the command completion. */
-	ratov_j = ha->r_a_tov/10 * 4 * 1000;
-	ratov_j = msecs_to_jiffies(ratov_j);
+	ratov_j = ha->r_a_tov / 10 * 4;
+	ratov_j = secs_to_jiffies(ratov_j);
 	switch (rval) {
 	case QLA_SUCCESS:
 		if (!wait_for_completion_timeout(&comp, ratov_j)) {
@@ -1806,8 +1806,8 @@ static void qla2x00_abort_srb(struct qla_qpair *qp, srb_t *sp, const int res,
 		rval = ha->isp_ops->abort_command(sp);
 		/* Wait for command completion. */
 		ret_cmd = false;
-		ratov_j = ha->r_a_tov/10 * 4 * 1000;
-		ratov_j = msecs_to_jiffies(ratov_j);
+		ratov_j = ha->r_a_tov / 10 * 4;
+		ratov_j = secs_to_jiffies(ratov_j);
 		switch (rval) {
 		case QLA_SUCCESS:
 			if (wait_for_completion_timeout(&comp, ratov_j)) {
-- 
2.50.1

Re: [PATCH RESEND] scsi: qla2xxx: Use secs_to_jiffies() instead of msecs_to_jiffies()

Posted by Martin K. Petersen 3 weeks, 2 days ago

On Thu, 28 Aug 2025 18:11:53 +0200, Thorsten Blum wrote:

> Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling
> 'ratov_j' to milliseconds.
> 
> No functional changes intended.
> 
> 

Applied to 6.18/scsi-queue, thanks!

[1/1] scsi: qla2xxx: Use secs_to_jiffies() instead of msecs_to_jiffies()
      https://git.kernel.org/mkp/scsi/c/e02436d37a47

-- 
Martin K. Petersen

Re: [PATCH RESEND] scsi: qla2xxx: Use secs_to_jiffies() instead of msecs_to_jiffies()

Posted by Martin K. Petersen 1 month ago

Thorsten,

> Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling
> 'ratov_j' to milliseconds.

Applied to 6.18/scsi-staging, thanks!

-- 
Martin K. Petersen

Re: [PATCH RESEND] scsi: qla2xxx: Use secs_to_jiffies() instead of msecs_to_jiffies()

Posted by Himanshu Madhani 1 month ago

On 8/28/25 9:11 AM, Thorsten Blum wrote:
> Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling
> 'ratov_j' to milliseconds.
> 
> No functional changes intended.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>   drivers/scsi/qla2xxx/qla_bsg.c | 4 ++--
>   drivers/scsi/qla2xxx/qla_os.c  | 8 ++++----
>   2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
> index 10431a67d202..ccfc2d26dd37 100644
> --- a/drivers/scsi/qla2xxx/qla_bsg.c
> +++ b/drivers/scsi/qla2xxx/qla_bsg.c
> @@ -3106,8 +3106,8 @@ static bool qla_bsg_found(struct qla_qpair *qpair, struct bsg_job *bsg_job)
>   	switch (rval) {
>   	case QLA_SUCCESS:
>   		/* Wait for the command completion. */
> -		ratov_j = ha->r_a_tov / 10 * 4 * 1000;
> -		ratov_j = msecs_to_jiffies(ratov_j);
> +		ratov_j = ha->r_a_tov / 10 * 4;
> +		ratov_j = secs_to_jiffies(ratov_j);
>   
>   		if (!wait_for_completion_timeout(&comp, ratov_j)) {
>   			ql_log(ql_log_info, vha, 0x7089,
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index d4b484c0fd9d..9a2f328200ab 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -1291,8 +1291,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
>   	       "Abort command mbx cmd=%p, rval=%x.\n", cmd, rval);
>   
>   	/* Wait for the command completion. */
> -	ratov_j = ha->r_a_tov/10 * 4 * 1000;
> -	ratov_j = msecs_to_jiffies(ratov_j);
> +	ratov_j = ha->r_a_tov / 10 * 4;
> +	ratov_j = secs_to_jiffies(ratov_j);
>   	switch (rval) {
>   	case QLA_SUCCESS:
>   		if (!wait_for_completion_timeout(&comp, ratov_j)) {
> @@ -1806,8 +1806,8 @@ static void qla2x00_abort_srb(struct qla_qpair *qp, srb_t *sp, const int res,
>   		rval = ha->isp_ops->abort_command(sp);
>   		/* Wait for command completion. */
>   		ret_cmd = false;
> -		ratov_j = ha->r_a_tov/10 * 4 * 1000;
> -		ratov_j = msecs_to_jiffies(ratov_j);
> +		ratov_j = ha->r_a_tov / 10 * 4;
> +		ratov_j = secs_to_jiffies(ratov_j);
>   		switch (rval) {
>   		case QLA_SUCCESS:
>   			if (wait_for_completion_timeout(&comp, ratov_j)) {

Looks okay.

Reviewed-by: Himanshu Madhani <hmadhani2024@gmail.com>

---
Himanshu Madhani