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

scsi: firewire: sbp2: 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-4-bvanassche@acm.org


Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c3f69c7f

drivers/firewire/sbp2.c

+5 −3
Original line number Diff line number Diff line
@@ -1578,11 +1578,13 @@ static ssize_t sbp2_sysfs_ieee1394_id_show(struct device *dev, 


static DEVICE_ATTR(ieee1394_id, S_IRUGO, sbp2_sysfs_ieee1394_id_show, NULL);



static struct device_attribute *sbp2_scsi_sysfs_attrs[] = {

	&dev_attr_ieee1394_id,

static struct attribute *sbp2_scsi_sysfs_attrs[] = {

	&dev_attr_ieee1394_id.attr,

	NULL

};



ATTRIBUTE_GROUPS(sbp2_scsi_sysfs);



static struct scsi_host_template scsi_driver_template = {

	.module			= THIS_MODULE,

	.name			= "SBP-2 IEEE-1394",
@@ -1595,7 +1597,7 @@ static struct scsi_host_template scsi_driver_template = { 
	.sg_tablesize		= SG_ALL,

	.max_segment_size	= SBP2_MAX_SEG_SIZE,

	.can_queue		= 1,

	.sdev_attrs		= sbp2_scsi_sysfs_attrs,

	.sdev_groups		= sbp2_scsi_sysfs_groups,

};



MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>");