2024-05-20 11:06:48

by Deming Wang

Subject: [PATCH] scsi: mpt3sas: Use a unified annotation style

Use a unified annotation style.

Signed-off-by: Deming Wang <[email protected]>
---
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 12d08d8ba538..97062b440e9d 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2681,8 +2681,8 @@ scsih_device_configure(struct scsi_device *sdev, struct queue_limits *lim)
spin_unlock_irqrestore(&ioc->pcie_device_lock, flags);
mpt3sas_scsih_change_queue_depth(sdev, qdepth);
/* Enable QUEUE_FLAG_NOMERGES flag, so that IOs won't be
- ** merged and can eliminate holes created during merging
- ** operation.
+ * merged and can eliminate holes created during merging
+ * operation.
**/
blk_queue_flag_set(QUEUE_FLAG_NOMERGES,
sdev->request_queue);
--
2.31.1

2024-05-21 11:36:22

by Johannes Thumshirn

Subject: Re: [PATCH] scsi: mpt3sas: Use a unified annotation style

On 20.05.24 13:06, Deming Wang wrote:
> Use a unified annotation style.
>
> Signed-off-by: Deming Wang <[email protected]>
> ---
> drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> index 12d08d8ba538..97062b440e9d 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> @@ -2681,8 +2681,8 @@ scsih_device_configure(struct scsi_device *sdev, struct queue_limits *lim)
> spin_unlock_irqrestore(&ioc->pcie_device_lock, flags);
> mpt3sas_scsih_change_queue_depth(sdev, qdepth);
> /* Enable QUEUE_FLAG_NOMERGES flag, so that IOs won't be
> - ** merged and can eliminate holes created during merging
> - ** operation.
> + * merged and can eliminate holes created during merging
> + * operation.
> **/
> blk_queue_flag_set(QUEUE_FLAG_NOMERGES,
> sdev->request_queue);

This still isn't the recommended kernel comment style.

/*
* Enable QUEUE_FLAG_NOMERGES flag, so that IOs won't be
* merged and can eliminate holes created during merging
* operation.
*/