Commit c7da4e1c authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ibmvscsi: 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-24-bvanassche@acm.org


Acked-by: default avatarTyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e8fbc28e

drivers/scsi/ibmvscsi/ibmvscsi.c

+12 −10
Original line number Original line Diff line number Diff line
@@ -2064,18 +2064,20 @@ static int ibmvscsi_host_reset(struct Scsi_Host *shost, int reset_type) 
	return 0;

	return 0;

}

}





static struct device_attribute *ibmvscsi_attrs[] = {

static struct attribute *ibmvscsi_host_attrs[] = {

	&ibmvscsi_host_vhost_loc,

	&ibmvscsi_host_vhost_loc.attr,

	&ibmvscsi_host_vhost_name,

	&ibmvscsi_host_vhost_name.attr,

	&ibmvscsi_host_srp_version,

	&ibmvscsi_host_srp_version.attr,

	&ibmvscsi_host_partition_name,

	&ibmvscsi_host_partition_name.attr,

	&ibmvscsi_host_partition_number,

	&ibmvscsi_host_partition_number.attr,

	&ibmvscsi_host_mad_version,

	&ibmvscsi_host_mad_version.attr,

	&ibmvscsi_host_os_type,

	&ibmvscsi_host_os_type.attr,

	&ibmvscsi_host_config,

	&ibmvscsi_host_config.attr,

	NULL

	NULL

};

};





ATTRIBUTE_GROUPS(ibmvscsi_host);



/* ------------------------------------------------------------

/* ------------------------------------------------------------

 * SCSI driver registration

 * SCSI driver registration

 */

 */
@@ -2095,7 +2097,7 @@ static struct scsi_host_template driver_template = { 
	.can_queue = IBMVSCSI_MAX_REQUESTS_DEFAULT,

	.can_queue = IBMVSCSI_MAX_REQUESTS_DEFAULT,

	.this_id = -1,

	.this_id = -1,

	.sg_tablesize = SG_ALL,

	.sg_tablesize = SG_ALL,

	.shost_attrs = ibmvscsi_attrs,

	.shost_groups = ibmvscsi_host_groups,

};

};





/**

/**