scsi: hpsa: Use sysfs_emit in show function callsbacks
Subsystems (2)
PATCH 1/1 scsi: hpsa: 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/hpsa.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-)
drivers/scsi/hpsa.c +18 -21
@@ -525,8 +525,7 @@ static ssize_t host_show_firmware_revision(struct device *dev,if (!h->hba_inquiry_data)return 0 ; fwrev = &h->hba_inquiry_data[32 ]; -return snprintf (buf,20 ,"%c%c%c%c\n" , - fwrev[0 ], fwrev[1 ], fwrev[2 ], fwrev[3 ]); +return sysfs_emit (buf,"%c%c%c%c\n" , fwrev[0 ], fwrev[1 ], fwrev[2 ], fwrev[3 ]); } static ssize_t host_show_commands_outstanding(struct device *dev,
@@ -535,8 +534,7 @@ static ssize_t host_show_commands_outstanding(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev);struct ctlr_info *h =shost_to_hba (shost); -return snprintf (buf,20 ,"%d\n" , -atomic_read (&h->commands_outstanding)); +return sysfs_emit (buf,"%d\n" ,atomic_read (&h->commands_outstanding)); } static ssize_t host_show_transport_mode(struct device *dev,
@@ -546,7 +544,7 @@ static ssize_t host_show_transport_mode(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev); h =shost_to_hba (shost); -return snprintf (buf,20 ,"%s\n" , +return sysfs_emit (buf,"%s\n" , h->transMethod & CFGTBL_Trans_Performant ?"performant" :"simple" ); }
@@ -558,7 +556,7 @@ static ssize_t host_show_hp_ssd_smart_path_status(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev); h =shost_to_hba (shost); -return snprintf (buf,30 ,"HP SSD Smart Path %s\n" , +return sysfs_emit (buf,"HP SSD Smart Path %s\n" , (h->acciopath_status ==1 ) ?"enabled" :"disabled" ); }
@@ -642,7 +640,7 @@ static ssize_t host_show_resettable(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev); h =shost_to_hba (shost); -return snprintf (buf,20 ,"%d\n" ,ctlr_is_resettable (h->board_id)); +return sysfs_emit (buf,"%d\n" ,ctlr_is_resettable (h->board_id)); }static inline int is_logical_dev_addr_mode (unsigned char scsi3addr[])
@@ -721,7 +719,7 @@ static ssize_t lunid_show(struct device *dev, }memcpy (lunid, hdev->scsi3addr,sizeof (lunid));spin_unlock_irqrestore (&h->lock, flags); -return snprintf (buf,20 ,"0x%8phN\n" , lunid); +return sysfs_emit (buf,"0x%8phN\n" , lunid); } static ssize_t unique_id_show(struct device *dev,
@@ -743,13 +741,13 @@ static ssize_t unique_id_show(struct device *dev, }memcpy (sn, hdev->device_id,sizeof (sn));spin_unlock_irqrestore (&h->lock, flags); -return snprintf (buf,16 *2 +2 , -"%02X%02X%02X%02X%02X%02X%02X%02X" -"%02X%02X%02X%02X%02X%02X%02X%02X\n" , - sn[0 ], sn[1 ], sn[2 ], sn[3 ], - sn[4 ], sn[5 ], sn[6 ], sn[7 ], - sn[8 ], sn[9 ], sn[10 ], sn[11 ], - sn[12 ], sn[13 ], sn[14 ], sn[15 ]); +return sysfs_emit (buf, +"%02X%02X%02X%02X%02X%02X%02X%02X" +"%02X%02X%02X%02X%02X%02X%02X%02X\n" , + sn[0 ], sn[1 ], sn[2 ], sn[3 ], + sn[4 ], sn[5 ], sn[6 ], sn[7 ], + sn[8 ], sn[9 ], sn[10 ], sn[11 ], + sn[12 ], sn[13 ], sn[14 ], sn[15 ]); } static ssize_t sas_address_show(struct device *dev,
@@ -772,7 +770,7 @@ static ssize_t sas_address_show(struct device *dev, sas_address = hdev->sas_address;spin_unlock_irqrestore (&h->lock, flags); -return snprintf (buf,PAGE_SIZE ,"0x%016llx\n" , sas_address); +return sysfs_emit (buf,"0x%016llx\n" , sas_address); } static ssize_t host_show_hp_ssd_smart_path_enabled(struct device *dev,
@@ -796,10 +794,9 @@ static ssize_t host_show_hp_ssd_smart_path_enabled(struct device *dev,spin_unlock_irqrestore (&h->lock, flags);if (hdev->devtype ==TYPE_DISK || hdev->devtype ==TYPE_ZBC ) -return snprintf (buf,20 ,"%d\n" , offload_enabled); +return sysfs_emit (buf,"%d\n" , offload_enabled);else -return snprintf (buf,40 ,"%s\n" , -"Not applicable for a controller" ); +return sysfs_emit (buf,"%s\n" ,"Not applicable for a controller" ); }#define MAX_PATHS 8
@@ -895,7 +892,7 @@ static ssize_t host_show_ctlr_num(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev); h =shost_to_hba (shost); -return snprintf (buf,20 ,"%d\n" , h->ctlr); +return sysfs_emit (buf,"%d\n" , h->ctlr); } static ssize_t host_show_legacy_board(struct device *dev,
@@ -905,7 +902,7 @@ static ssize_t host_show_legacy_board(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev); h =shost_to_hba (shost); -return snprintf (buf,20 ,"%d\n" , h->legacy_board ?1 :0 ); +return sysfs_emit (buf,"%d\n" , h->legacy_board ?1 :0 ); }static DEVICE_ATTR_RO (raid_level);
--
2.34.1