Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: ipr: Switch to attribute groups

struct device supports attribute groups directly but does not support
struct device_attribute directly. Hence switch to attribute groups.

Link: https://lore.kernel.org/r/20211012233558.4066756-26-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Bart Van Assche and committed by
Martin K. Petersen
47d1e6ae 7adbf68f

+21 -17
+21 -17
drivers/scsi/ipr.c
··· 4236 4236 .write = ipr_next_async_err_log 4237 4237 }; 4238 4238 4239 - static struct device_attribute *ipr_ioa_attrs[] = { 4240 - &ipr_fw_version_attr, 4241 - &ipr_log_level_attr, 4242 - &ipr_diagnostics_attr, 4243 - &ipr_ioa_state_attr, 4244 - &ipr_ioa_reset_attr, 4245 - &ipr_update_fw_attr, 4246 - &ipr_ioa_fw_type_attr, 4247 - &ipr_iopoll_weight_attr, 4239 + static struct attribute *ipr_ioa_attrs[] = { 4240 + &ipr_fw_version_attr.attr, 4241 + &ipr_log_level_attr.attr, 4242 + &ipr_diagnostics_attr.attr, 4243 + &ipr_ioa_state_attr.attr, 4244 + &ipr_ioa_reset_attr.attr, 4245 + &ipr_update_fw_attr.attr, 4246 + &ipr_ioa_fw_type_attr.attr, 4247 + &ipr_iopoll_weight_attr.attr, 4248 4248 NULL, 4249 4249 }; 4250 + 4251 + ATTRIBUTE_GROUPS(ipr_ioa); 4250 4252 4251 4253 #ifdef CONFIG_SCSI_IPR_DUMP 4252 4254 /** ··· 4734 4732 .store = ipr_store_raw_mode 4735 4733 }; 4736 4734 4737 - static struct device_attribute *ipr_dev_attrs[] = { 4738 - &ipr_adapter_handle_attr, 4739 - &ipr_resource_path_attr, 4740 - &ipr_device_id_attr, 4741 - &ipr_resource_type_attr, 4742 - &ipr_raw_mode_attr, 4735 + static struct attribute *ipr_dev_attrs[] = { 4736 + &ipr_adapter_handle_attr.attr, 4737 + &ipr_resource_path_attr.attr, 4738 + &ipr_device_id_attr.attr, 4739 + &ipr_resource_type_attr.attr, 4740 + &ipr_raw_mode_attr.attr, 4743 4741 NULL, 4744 4742 }; 4743 + 4744 + ATTRIBUTE_GROUPS(ipr_dev); 4745 4745 4746 4746 /** 4747 4747 * ipr_biosparam - Return the HSC mapping ··· 6766 6762 .sg_tablesize = IPR_MAX_SGLIST, 6767 6763 .max_sectors = IPR_IOA_MAX_SECTORS, 6768 6764 .cmd_per_lun = IPR_MAX_CMD_PER_LUN, 6769 - .shost_attrs = ipr_ioa_attrs, 6770 - .sdev_attrs = ipr_dev_attrs, 6765 + .shost_groups = ipr_ioa_groups, 6766 + .sdev_groups = ipr_dev_groups, 6771 6767 .proc_name = IPR_NAME, 6772 6768 }; 6773 6769