Skip to content

Commit 9bb8e30

Browse files
l1kgregkh
l1k
authored and
gregkh
committed
scsi: Use device_show_string() helper for sysfs attributes
Deduplicate sysfs ->show() callbacks which expose a string at a static memory location. Use the newly introduced device_show_string() helper in the driver core instead by declaring those sysfs attributes with DEVICE_STRING_ATTR_RO(). No functional change intended. Signed-off-by: Lukas Wunner <[email protected]> Link: https://lore.kernel.org/r/b11792137186f5a6794f12fdf891d0c6d51b3557.1713608122.git.lukas@wunner.de Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 3182459 commit 9bb8e30

File tree

5 files changed

+16
-55
lines changed

5 files changed

+16
-55
lines changed

‎drivers/scsi/bfa/bfad_attr.c

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -853,13 +853,6 @@ bfad_im_hw_version_show(struct device *dev, struct device_attribute *attr,
853853
return sysfs_emit(buf, "%s\n", hw_ver);
854854
}
855855

856-
static ssize_t
857-
bfad_im_drv_version_show(struct device *dev, struct device_attribute *attr,
858-
char *buf)
859-
{
860-
return sysfs_emit(buf, "%s\n", BFAD_DRIVER_VERSION);
861-
}
862-
863856
static ssize_t
864857
bfad_im_optionrom_version_show(struct device *dev,
865858
struct device_attribute *attr, char *buf)
@@ -901,13 +894,6 @@ bfad_im_num_of_ports_show(struct device *dev, struct device_attribute *attr,
901894
bfa_get_nports(&bfad->bfa));
902895
}
903896

904-
static ssize_t
905-
bfad_im_drv_name_show(struct device *dev, struct device_attribute *attr,
906-
char *buf)
907-
{
908-
return sysfs_emit(buf, "%s\n", BFAD_DRIVER_NAME);
909-
}
910-
911897
static ssize_t
912898
bfad_im_num_of_discovered_ports_show(struct device *dev,
913899
struct device_attribute *attr, char *buf)
@@ -944,15 +930,15 @@ static DEVICE_ATTR(symbolic_name, S_IRUGO,
944930
bfad_im_symbolic_name_show, NULL);
945931
static DEVICE_ATTR(hardware_version, S_IRUGO,
946932
bfad_im_hw_version_show, NULL);
947-
static DEVICE_ATTR(driver_version, S_IRUGO,
948-
bfad_im_drv_version_show, NULL);
933+
static DEVICE_STRING_ATTR_RO(driver_version, S_IRUGO,
934+
BFAD_DRIVER_VERSION);
949935
static DEVICE_ATTR(option_rom_version, S_IRUGO,
950936
bfad_im_optionrom_version_show, NULL);
951937
static DEVICE_ATTR(firmware_version, S_IRUGO,
952938
bfad_im_fw_version_show, NULL);
953939
static DEVICE_ATTR(number_of_ports, S_IRUGO,
954940
bfad_im_num_of_ports_show, NULL);
955-
static DEVICE_ATTR(driver_name, S_IRUGO, bfad_im_drv_name_show, NULL);
941+
static DEVICE_STRING_ATTR_RO(driver_name, S_IRUGO, BFAD_DRIVER_NAME);
956942
static DEVICE_ATTR(number_of_discovered_ports, S_IRUGO,
957943
bfad_im_num_of_discovered_ports_show, NULL);
958944

@@ -963,11 +949,11 @@ static struct attribute *bfad_im_host_attrs[] = {
963949
&dev_attr_node_name.attr,
964950
&dev_attr_symbolic_name.attr,
965951
&dev_attr_hardware_version.attr,
966-
&dev_attr_driver_version.attr,
952+
&dev_attr_driver_version.attr.attr,
967953
&dev_attr_option_rom_version.attr,
968954
&dev_attr_firmware_version.attr,
969955
&dev_attr_number_of_ports.attr,
970-
&dev_attr_driver_name.attr,
956+
&dev_attr_driver_name.attr.attr,
971957
&dev_attr_number_of_discovered_ports.attr,
972958
NULL,
973959
};
@@ -988,11 +974,11 @@ static struct attribute *bfad_im_vport_attrs[] = {
988974
&dev_attr_node_name.attr,
989975
&dev_attr_symbolic_name.attr,
990976
&dev_attr_hardware_version.attr,
991-
&dev_attr_driver_version.attr,
977+
&dev_attr_driver_version.attr.attr,
992978
&dev_attr_option_rom_version.attr,
993979
&dev_attr_firmware_version.attr,
994980
&dev_attr_number_of_ports.attr,
995-
&dev_attr_driver_name.attr,
981+
&dev_attr_driver_name.attr.attr,
996982
&dev_attr_number_of_discovered_ports.attr,
997983
NULL,
998984
};

‎drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3613,12 +3613,6 @@ static void ibmvscsis_remove(struct vio_dev *vdev)
36133613
kfree(vscsi);
36143614
}
36153615

3616-
static ssize_t system_id_show(struct device *dev,
3617-
struct device_attribute *attr, char *buf)
3618-
{
3619-
return sysfs_emit(buf, "%s\n", system_id);
3620-
}
3621-
36223616
static ssize_t partition_number_show(struct device *dev,
36233617
struct device_attribute *attr, char *buf)
36243618
{
@@ -3982,8 +3976,7 @@ static const struct target_core_fabric_ops ibmvscsis_ops = {
39823976

39833977
static void ibmvscsis_dev_release(struct device *dev) {};
39843978

3985-
static struct device_attribute dev_attr_system_id =
3986-
__ATTR(system_id, S_IRUGO, system_id_show, NULL);
3979+
static DEVICE_STRING_ATTR_RO(system_id, S_IRUGO, system_id);
39873980

39883981
static struct device_attribute dev_attr_partition_number =
39893982
__ATTR(partition_number, S_IRUGO, partition_number_show, NULL);
@@ -3992,7 +3985,7 @@ static struct device_attribute dev_attr_unit_address =
39923985
__ATTR(unit_address, S_IRUGO, unit_address_show, NULL);
39933986

39943987
static struct attribute *ibmvscsis_dev_attrs[] = {
3995-
&dev_attr_system_id.attr,
3988+
&dev_attr_system_id.attr.attr,
39963989
&dev_attr_partition_number.attr,
39973990
&dev_attr_unit_address.attr,
39983991
};

‎drivers/scsi/mvsas/mv_init.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -691,13 +691,7 @@ static struct pci_driver mvs_pci_driver = {
691691
.remove = mvs_pci_remove,
692692
};
693693

694-
static ssize_t driver_version_show(struct device *cdev,
695-
struct device_attribute *attr, char *buffer)
696-
{
697-
return sysfs_emit(buffer, "%s\n", DRV_VERSION);
698-
}
699-
700-
static DEVICE_ATTR_RO(driver_version);
694+
static DEVICE_STRING_ATTR_RO(driver_version, 0444, DRV_VERSION);
701695

702696
static ssize_t interrupt_coalescing_store(struct device *cdev,
703697
struct device_attribute *attr,
@@ -772,7 +766,7 @@ static void __exit mvs_exit(void)
772766
}
773767

774768
static struct attribute *mvst_host_attrs[] = {
775-
&dev_attr_driver_version.attr,
769+
&dev_attr_driver_version.attr.attr,
776770
&dev_attr_interrupt_coalescing.attr,
777771
NULL,
778772
};

‎drivers/scsi/qla2xxx/qla_attr.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,13 +1067,6 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *vha, bool stop_beacon)
10671067

10681068
/* Scsi_Host attributes. */
10691069

1070-
static ssize_t
1071-
qla2x00_driver_version_show(struct device *dev,
1072-
struct device_attribute *attr, char *buf)
1073-
{
1074-
return scnprintf(buf, PAGE_SIZE, "%s\n", qla2x00_version_str);
1075-
}
1076-
10771070
static ssize_t
10781071
qla2x00_fw_version_show(struct device *dev,
10791072
struct device_attribute *attr, char *buf)
@@ -2412,7 +2405,7 @@ qla2x00_dport_diagnostics_show(struct device *dev,
24122405
static DEVICE_ATTR(dport_diagnostics, 0444,
24132406
qla2x00_dport_diagnostics_show, NULL);
24142407

2415-
static DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_driver_version_show, NULL);
2408+
static DEVICE_STRING_ATTR_RO(driver_version, S_IRUGO, qla2x00_version_str);
24162409
static DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);
24172410
static DEVICE_ATTR(serial_num, S_IRUGO, qla2x00_serial_num_show, NULL);
24182411
static DEVICE_ATTR(isp_name, S_IRUGO, qla2x00_isp_name_show, NULL);
@@ -2478,7 +2471,7 @@ static DEVICE_ATTR(port_no, 0444, qla2x00_port_no_show, NULL);
24782471
static DEVICE_ATTR(fw_attr, 0444, qla2x00_fw_attr_show, NULL);
24792472

24802473
static struct attribute *qla2x00_host_attrs[] = {
2481-
&dev_attr_driver_version.attr,
2474+
&dev_attr_driver_version.attr.attr,
24822475
&dev_attr_fw_version.attr,
24832476
&dev_attr_serial_num.attr,
24842477
&dev_attr_isp_name.attr,

‎drivers/scsi/smartpqi/smartpqi_init.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6892,12 +6892,6 @@ static ssize_t pqi_firmware_version_show(struct device *dev,
68926892
return scnprintf(buffer, PAGE_SIZE, "%s\n", ctrl_info->firmware_version);
68936893
}
68946894

6895-
static ssize_t pqi_driver_version_show(struct device *dev,
6896-
struct device_attribute *attr, char *buffer)
6897-
{
6898-
return scnprintf(buffer, PAGE_SIZE, "%s\n", DRIVER_VERSION BUILD_TIMESTAMP);
6899-
}
6900-
69016895
static ssize_t pqi_serial_number_show(struct device *dev,
69026896
struct device_attribute *attr, char *buffer)
69036897
{
@@ -7066,7 +7060,8 @@ static ssize_t pqi_host_enable_r6_writes_store(struct device *dev,
70667060
return count;
70677061
}
70687062

7069-
static DEVICE_ATTR(driver_version, 0444, pqi_driver_version_show, NULL);
7063+
static DEVICE_STRING_ATTR_RO(driver_version, 0444,
7064+
DRIVER_VERSION BUILD_TIMESTAMP);
70707065
static DEVICE_ATTR(firmware_version, 0444, pqi_firmware_version_show, NULL);
70717066
static DEVICE_ATTR(model, 0444, pqi_model_show, NULL);
70727067
static DEVICE_ATTR(serial_number, 0444, pqi_serial_number_show, NULL);
@@ -7083,7 +7078,7 @@ static DEVICE_ATTR(enable_r6_writes, 0644,
70837078
pqi_host_enable_r6_writes_show, pqi_host_enable_r6_writes_store);
70847079

70857080
static struct attribute *pqi_shost_attrs[] = {
7086-
&dev_attr_driver_version.attr,
7081+
&dev_attr_driver_version.attr.attr,
70877082
&dev_attr_firmware_version.attr,
70887083
&dev_attr_model.attr,
70897084
&dev_attr_serial_number.attr,

0 commit comments

Comments
 (0)