scsi: mpt3sas: use sysfs_emit function in sysfs
Subsystems (2)
PATCH 1/1 scsi: mpt3sas: use sysfs_emit function in sysfs
Replace snprintf() with sysfs_emit() function as it removes unnecessary use cases of PAGE_SIZE also it is much preferred for sysfs functions. This conversion makes code more maintainable and follows current kernel code guidelines.
--- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_ctl.c +22 -22
@@ -3149,7 +3149,7 @@ version_fw_show(struct device *cdev, struct device_attribute *attr,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); - return snprintf(buf, PAGE_SIZE, "%02d.%02d.%02d.%02d\n", + return sysfs_emit(buf, "%02d.%02d.%02d.%02d\n", (ioc->facts.FWVersion.Word & 0xFF000000) >> 24, (ioc->facts.FWVersion.Word & 0x00FF0000) >> 16, (ioc->facts.FWVersion.Word & 0x0000FF00) >> 8,
@@ -3174,7 +3174,7 @@ version_bios_show(struct device *cdev, struct device_attribute *attr,u32 version =le32_to_cpu (ioc->bios_pg3.BiosVersion); - return snprintf(buf, PAGE_SIZE, "%02d.%02d.%02d.%02d\n", + return sysfs_emit(buf, "%02d.%02d.%02d.%02d\n", (version & 0xFF000000) >> 24, (version & 0x00FF0000) >> 16, (version & 0x0000FF00) >> 8,
@@ -3197,7 +3197,7 @@ version_mpi_show(struct device *cdev, struct device_attribute *attr,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%03x.%02x\n" , +return sysfs_emit (buf,"%03x.%02x\n" , ioc->facts.MsgVersion, ioc->facts.HeaderVersion >>8 ); }static DEVICE_ATTR_RO (version_mpi);
@@ -3236,7 +3236,7 @@ version_nvdata_persistent_show(struct device *cdev,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%08xh\n" , +return sysfs_emit (buf,"%08xh\n" ,le32_to_cpu (ioc->iounit_pg0.NvdataVersionPersistent.Word)); }static DEVICE_ATTR_RO (version_nvdata_persistent);
@@ -3256,7 +3256,7 @@ version_nvdata_default_show(struct device *cdev, struct device_attributestruct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%08xh\n" , +return sysfs_emit (buf,"%08xh\n" ,le32_to_cpu (ioc->iounit_pg0.NvdataVersionDefault.Word)); }static DEVICE_ATTR_RO (version_nvdata_default);
@@ -3336,7 +3336,7 @@ io_delay_show(struct device *cdev, struct device_attribute *attr,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%02d\n" , ioc->io_missing_delay); +return sysfs_emit (buf,"%02d\n" , ioc->io_missing_delay); }static DEVICE_ATTR_RO (io_delay);
@@ -3358,7 +3358,7 @@ device_delay_show(struct device *cdev, struct device_attribute *attr,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%02d\n" , ioc->device_missing_delay); +return sysfs_emit (buf,"%02d\n" , ioc->device_missing_delay); }static DEVICE_ATTR_RO (device_delay);
@@ -3379,7 +3379,7 @@ fw_queue_depth_show(struct device *cdev, struct device_attribute *attr,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%02d\n" , ioc->facts.RequestCredit); +return sysfs_emit (buf,"%02d\n" , ioc->facts.RequestCredit); }static DEVICE_ATTR_RO (fw_queue_depth);
@@ -3401,7 +3401,7 @@ host_sas_address_show(struct device *cdev, struct device_attribute *attr,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"0x%016llx\n" , +return sysfs_emit (buf,"0x%016llx\n" , (unsigned long long )ioc->sas_hba.sas_address); }static DEVICE_ATTR_RO (host_sas_address);
@@ -3421,7 +3421,7 @@ logging_level_show(struct device *cdev, struct device_attribute *attr,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%08xh\n" , ioc->logging_level); +return sysfs_emit (buf,"%08xh\n" , ioc->logging_level); } static ssize_t logging_level_store(struct device *cdev, struct device_attribute *attr,
@@ -3457,7 +3457,7 @@ fwfault_debug_show(struct device *cdev, struct device_attribute *attr,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%d\n" , ioc->fwfault_debug); +return sysfs_emit (buf,"%d\n" , ioc->fwfault_debug); } static ssize_t fwfault_debug_store(struct device *cdev, struct device_attribute *attr,
@@ -3494,7 +3494,7 @@ ioc_reset_count_show(struct device *cdev, struct device_attribute *attr,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%d\n" , ioc->ioc_reset_count); +return sysfs_emit (buf,"%d\n" , ioc->ioc_reset_count); }static DEVICE_ATTR_RO (ioc_reset_count);
@@ -3522,7 +3522,7 @@ reply_queue_count_show(struct device *cdev,else reply_queue_count =1 ; -return snprintf (buf,PAGE_SIZE ,"%d\n" , reply_queue_count); +return sysfs_emit (buf,"%d\n" , reply_queue_count); }static DEVICE_ATTR_RO (reply_queue_count);
@@ -3644,7 +3644,7 @@ host_trace_buffer_size_show(struct device *cdev, size =le32_to_cpu (request_data->Size); ioc->ring_buffer_sz = size; -return snprintf (buf,PAGE_SIZE ,"%d\n" , size); +return sysfs_emit (buf,"%d\n" , size); }static DEVICE_ATTR_RO (host_trace_buffer_size);
@@ -3731,12 +3731,12 @@ host_trace_buffer_enable_show(struct device *cdev,if ((!ioc->diag_buffer[MPI2_DIAG_BUF_TYPE_TRACE ]) || ((ioc->diag_buffer_status[MPI2_DIAG_BUF_TYPE_TRACE ] &MPT3_DIAG_BUFFER_IS_REGISTERED ) ==0 )) -return snprintf (buf,PAGE_SIZE ,"off\n" ); +return sysfs_emit (buf,"off\n" );else if ((ioc->diag_buffer_status[MPI2_DIAG_BUF_TYPE_TRACE ] &MPT3_DIAG_BUFFER_IS_RELEASED )) -return snprintf (buf,PAGE_SIZE ,"release\n" ); +return sysfs_emit (buf,"release\n" );else -return snprintf (buf,PAGE_SIZE ,"post\n" ); +return sysfs_emit (buf,"post\n" ); } static ssize_t
@@ -4152,7 +4152,7 @@ drv_support_bitmap_show(struct device *cdev,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"0x%08x\n" , ioc->drv_support_bitmap); +return sysfs_emit (buf,"0x%08x\n" , ioc->drv_support_bitmap); }static DEVICE_ATTR_RO (drv_support_bitmap);
@@ -4172,7 +4172,7 @@ enable_sdev_max_qd_show(struct device *cdev,struct Scsi_Host *shost =class_to_shost (cdev);struct MPT3SAS_ADAPTER *ioc =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%d\n" , ioc->enable_sdev_max_qd); +return sysfs_emit (buf,"%d\n" , ioc->enable_sdev_max_qd); }/**
@@ -4320,7 +4320,7 @@ sas_address_show(struct device *dev, struct device_attribute *attr,struct scsi_device *sdev =to_scsi_device (dev);struct MPT3SAS_DEVICE *sas_device_priv_data = sdev->hostdata; -return snprintf (buf,PAGE_SIZE ,"0x%016llx\n" , +return sysfs_emit (buf,"0x%016llx\n" , (unsigned long long )sas_device_priv_data->sas_target->sas_address); }static DEVICE_ATTR_RO (sas_address);
@@ -4342,7 +4342,7 @@ sas_device_handle_show(struct device *dev, struct device_attribute *attr,struct scsi_device *sdev =to_scsi_device (dev);struct MPT3SAS_DEVICE *sas_device_priv_data = sdev->hostdata; -return snprintf (buf,PAGE_SIZE ,"0x%04x\n" , +return sysfs_emit (buf,"0x%04x\n" , sas_device_priv_data->sas_target->handle); }static DEVICE_ATTR_RO (sas_device_handle);
@@ -4380,7 +4380,7 @@ sas_ncq_prio_enable_show(struct device *dev,struct scsi_device *sdev =to_scsi_device (dev);struct MPT3SAS_DEVICE *sas_device_priv_data = sdev->hostdata; -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return sysfs_emit (buf,"%d\n" , sas_device_priv_data->ncq_prio_enable); }
--
2.51.0
Shi,
Quoted 4 lines
Replace
snprintf()withsysfs_emit()function as it removes unnecessary use cases ofPAGE_SIZEalso it is much preferred for sysfs functions. This conversion makes code more maintainable and follows current kernel code guidelines.
From Documentation/filesystems/sysfs.rst:
- New implementations of show() methods should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space.
mpt3sas is not a "new implementation".
Signature · 1 line
Martin K. Petersen
Quoted 8 lines · Martin K. Petersen
From
Documentation/filesystems/sysfs.rst:- New implementations of
show()methods should only usesysfs_emit()orsysfs_emit_at()when formatting the value to be returned to user space.mpt3sas is not a "new implementation".
Thanks for letting me know about this.Regret not Thoroughly investigating this further Thanks for you time .