scsi: myrb: Use sysfs_emit in show function callsbacks
Subsystems (2)
PATCH 1/1 scsi: myrb: Use sysfs_emit in show function callsbacks
According to Documentation/filesystems/sysfs.rst, the show() callback function of kobject attributes should strictly use sysfs_emit instead of sprintf family functions. Also, merge split lines wherever possible due to shortened length of lines.
Issue identified using the coccinelle device_attr_show.cocci script.
Signed-off-by Deepak R Varma <[email protected]>
--- drivers/scsi/myrb.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/scsi/myrb.c +12 -13
@@ -1767,7 +1767,7 @@ static ssize_t raid_state_show(struct device *dev,int ret;if (!sdev->hostdata) -return snprintf (buf,16 ,"Unknown\n" ); +return sysfs_emit (buf,"Unknown\n" );if (sdev->channel ==myrb_logical_channel (sdev->host)) {struct myrb_ldev_info *ldev_info = sdev->hostdata;
@@ -1886,11 +1886,10 @@ static ssize_t raid_level_show(struct device *dev, name =myrb_raidlevel_name (ldev_info->raid_level);if (!name) -return snprintf (buf,32 ,"Invalid (%02X)\n" , - ldev_info->state); -return snprintf (buf,32 ,"%s\n" , name); +return sysfs_emit (buf,"Invalid (%02X)\n" , ldev_info->state); +return sysfs_emit (buf,"%s\n" , name); } -return snprintf (buf,32 ,"Physical Drive\n" ); +return sysfs_emit (buf,"Physical Drive\n" ); }static DEVICE_ATTR_RO (raid_level);
@@ -1903,17 +1902,17 @@ static ssize_t rebuild_show(struct device *dev,unsigned char status;if (sdev->channel <myrb_logical_channel (sdev->host)) -return snprintf (buf,32 ,"physical device - not rebuilding\n" ); +return sysfs_emit (buf,"physical device - not rebuilding\n" ); status =myrb_get_rbld_progress (cb, &rbld_buf);if (rbld_buf.ldev_num != sdev->id || status !=MYRB_STATUS_SUCCESS ) -return snprintf (buf,32 ,"not rebuilding\n" ); +return sysfs_emit (buf,"not rebuilding\n" ); -return snprintf (buf,32 ,"rebuilding block %u of %u\n" , - rbld_buf.ldev_size - rbld_buf.blocks_left, - rbld_buf.ldev_size); +return sysfs_emit (buf,"rebuilding block %u of %u\n" , + rbld_buf.ldev_size - rbld_buf.blocks_left, + rbld_buf.ldev_size); } static ssize_t rebuild_store(struct device *dev,
@@ -2140,7 +2139,7 @@ static ssize_t ctlr_num_show(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev);struct myrb_hba *cb =shost_priv (shost); -return snprintf (buf,20 ,"%u\n" , cb->ctlr_num); +return sysfs_emit (buf,"%u\n" , cb->ctlr_num); }static DEVICE_ATTR_RO (ctlr_num);
@@ -2150,7 +2149,7 @@ static ssize_t firmware_show(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev);struct myrb_hba *cb =shost_priv (shost); -return snprintf (buf,16 ,"%s\n" , cb->fw_version); +return sysfs_emit (buf,"%s\n" , cb->fw_version); }static DEVICE_ATTR_RO (firmware);
@@ -2160,7 +2159,7 @@ static ssize_t model_show(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev);struct myrb_hba *cb =shost_priv (shost); -return snprintf (buf,16 ,"%s\n" , cb->model_name); +return sysfs_emit (buf,"%s\n" , cb->model_name); }static DEVICE_ATTR_RO (model);
--
2.34.1