5.15-stable review patch. If anyone has any objections, please let me know. ------------------ This reverts commit e3789fa42d068f0c0c5c24063a1f941c8c4a8627. Signed-off-by: Sasha Levin --- drivers/scsi/smartpqi/smartpqi_init.c | 46 ++++++++++++--------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 6ecc56fb9fb25..f1ba5087e0eed 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -6664,22 +6664,20 @@ static DEVICE_ATTR(enable_r5_writes, 0644, static DEVICE_ATTR(enable_r6_writes, 0644, pqi_host_enable_r6_writes_show, pqi_host_enable_r6_writes_store); -static struct attribute *pqi_shost_attrs[] = { - &dev_attr_driver_version.attr, - &dev_attr_firmware_version.attr, - &dev_attr_model.attr, - &dev_attr_serial_number.attr, - &dev_attr_vendor.attr, - &dev_attr_rescan.attr, - &dev_attr_lockup_action.attr, - &dev_attr_enable_stream_detection.attr, - &dev_attr_enable_r5_writes.attr, - &dev_attr_enable_r6_writes.attr, +static struct device_attribute *pqi_shost_attrs[] = { + &dev_attr_driver_version, + &dev_attr_firmware_version, + &dev_attr_model, + &dev_attr_serial_number, + &dev_attr_vendor, + &dev_attr_rescan, + &dev_attr_lockup_action, + &dev_attr_enable_stream_detection, + &dev_attr_enable_r5_writes, + &dev_attr_enable_r6_writes, NULL }; -ATTRIBUTE_GROUPS(pqi_shost); - static ssize_t pqi_unique_id_show(struct device *dev, struct device_attribute *attr, char *buffer) { @@ -6950,19 +6948,17 @@ static DEVICE_ATTR(ssd_smart_path_enabled, 0444, pqi_ssd_smart_path_enabled_show static DEVICE_ATTR(raid_level, 0444, pqi_raid_level_show, NULL); static DEVICE_ATTR(raid_bypass_cnt, 0444, pqi_raid_bypass_cnt_show, NULL); -static struct attribute *pqi_sdev_attrs[] = { - &dev_attr_lunid.attr, - &dev_attr_unique_id.attr, - &dev_attr_path_info.attr, - &dev_attr_sas_address.attr, - &dev_attr_ssd_smart_path_enabled.attr, - &dev_attr_raid_level.attr, - &dev_attr_raid_bypass_cnt.attr, +static struct device_attribute *pqi_sdev_attrs[] = { + &dev_attr_lunid, + &dev_attr_unique_id, + &dev_attr_path_info, + &dev_attr_sas_address, + &dev_attr_ssd_smart_path_enabled, + &dev_attr_raid_level, + &dev_attr_raid_bypass_cnt, NULL }; -ATTRIBUTE_GROUPS(pqi_sdev); - static struct scsi_host_template pqi_driver_template = { .module = THIS_MODULE, .name = DRIVER_NAME_SHORT, @@ -6977,8 +6973,8 @@ static struct scsi_host_template pqi_driver_template = { .slave_configure = pqi_slave_configure, .slave_destroy = pqi_slave_destroy, .map_queues = pqi_map_queues, - .sdev_groups = pqi_sdev_groups, - .shost_groups = pqi_shost_groups, + .sdev_attrs = pqi_sdev_attrs, + .shost_attrs = pqi_shost_attrs, }; static int pqi_register_scsi(struct pqi_ctrl_info *ctrl_info) -- 2.53.0