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

scsi: ata: 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-3-bvanassche@acm.org


Acked-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 92c4b58b

drivers/ata/ahci.h

+4 −4
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ struct ahci_host_priv { 


extern int ahci_ignore_sss;



extern struct device_attribute *ahci_shost_attrs[];

extern struct device_attribute *ahci_sdev_attrs[];

extern const struct attribute_group *ahci_shost_groups[];

extern const struct attribute_group *ahci_sdev_groups[];



/*

 * This must be instantiated by the edge drivers.  Read the comments
@@ -388,8 +388,8 @@ extern struct device_attribute *ahci_sdev_attrs[]; 
	.can_queue		= AHCI_MAX_CMDS,			\

	.sg_tablesize		= AHCI_MAX_SG,				\

	.dma_boundary		= AHCI_DMA_BOUNDARY,			\

	.shost_attrs		= ahci_shost_attrs,			\

	.sdev_attrs		= ahci_sdev_attrs,			\

	.shost_groups		= ahci_shost_groups,			\

	.sdev_groups		= ahci_sdev_groups,			\

	.change_queue_depth     = ata_scsi_change_queue_depth,		\

	.tag_alloc_policy       = BLK_TAG_ALLOC_RR,             	\

	.slave_configure        = ata_scsi_slave_config

drivers/ata/ata_piix.c

+5 −3
Original line number Diff line number Diff line
@@ -1085,14 +1085,16 @@ static struct ata_port_operations ich_pata_ops = { 
	.set_dmamode		= ich_set_dmamode,

};



static struct device_attribute *piix_sidpr_shost_attrs[] = {

	&dev_attr_link_power_management_policy,

static struct attribute *piix_sidpr_shost_attrs[] = {

	&dev_attr_link_power_management_policy.attr,

	NULL

};



ATTRIBUTE_GROUPS(piix_sidpr_shost);



static struct scsi_host_template piix_sidpr_sht = {

	ATA_BMDMA_SHT(DRV_NAME),

	.shost_attrs		= piix_sidpr_shost_attrs,

	.shost_groups		= piix_sidpr_shost_groups,

};



static struct ata_port_operations piix_sidpr_sata_ops = {

drivers/ata/libahci.c

+35 −17
Original line number Diff line number Diff line
@@ -108,28 +108,46 @@ static DEVICE_ATTR(em_buffer, S_IWUSR | S_IRUGO, 
		   ahci_read_em_buffer, ahci_store_em_buffer);

static DEVICE_ATTR(em_message_supported, S_IRUGO, ahci_show_em_supported, NULL);



struct device_attribute *ahci_shost_attrs[] = {

	&dev_attr_link_power_management_policy,

	&dev_attr_em_message_type,

	&dev_attr_em_message,

	&dev_attr_ahci_host_caps,

	&dev_attr_ahci_host_cap2,

	&dev_attr_ahci_host_version,

	&dev_attr_ahci_port_cmd,

	&dev_attr_em_buffer,

	&dev_attr_em_message_supported,

static struct attribute *ahci_shost_attrs[] = {

	&dev_attr_link_power_management_policy.attr,

	&dev_attr_em_message_type.attr,

	&dev_attr_em_message.attr,

	&dev_attr_ahci_host_caps.attr,

	&dev_attr_ahci_host_cap2.attr,

	&dev_attr_ahci_host_version.attr,

	&dev_attr_ahci_port_cmd.attr,

	&dev_attr_em_buffer.attr,

	&dev_attr_em_message_supported.attr,

	NULL

};

EXPORT_SYMBOL_GPL(ahci_shost_attrs);



struct device_attribute *ahci_sdev_attrs[] = {

	&dev_attr_sw_activity,

	&dev_attr_unload_heads,

	&dev_attr_ncq_prio_supported,

	&dev_attr_ncq_prio_enable,

static const struct attribute_group ahci_shost_attr_group = {

	.attrs = ahci_shost_attrs

};



const struct attribute_group *ahci_shost_groups[] = {

	&ahci_shost_attr_group,

	NULL

};

EXPORT_SYMBOL_GPL(ahci_shost_groups);



struct attribute *ahci_sdev_attrs[] = {

	&dev_attr_sw_activity.attr,

	&dev_attr_unload_heads.attr,

	&dev_attr_ncq_prio_supported.attr,

	&dev_attr_ncq_prio_enable.attr,

	NULL

};



static const struct attribute_group ahci_sdev_attr_group = {

	.attrs = ahci_sdev_attrs

};



const struct attribute_group *ahci_sdev_groups[] = {

	&ahci_sdev_attr_group,

	NULL

};

EXPORT_SYMBOL_GPL(ahci_sdev_attrs);

EXPORT_SYMBOL_GPL(ahci_sdev_groups);



struct ata_port_operations ahci_ops = {

	.inherits		= &sata_pmp_port_ops,

drivers/ata/libata-sata.c

+14 −5
Original line number Diff line number Diff line
@@ -922,13 +922,22 @@ DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, 
	    ata_ncq_prio_enable_show, ata_ncq_prio_enable_store);

EXPORT_SYMBOL_GPL(dev_attr_ncq_prio_enable);



struct device_attribute *ata_ncq_sdev_attrs[] = {

	&dev_attr_unload_heads,

	&dev_attr_ncq_prio_enable,

	&dev_attr_ncq_prio_supported,

struct attribute *ata_ncq_sdev_attrs[] = {

	&dev_attr_unload_heads.attr,

	&dev_attr_ncq_prio_enable.attr,

	&dev_attr_ncq_prio_supported.attr,

	NULL

};

EXPORT_SYMBOL_GPL(ata_ncq_sdev_attrs);



static const struct attribute_group ata_ncq_sdev_attr_group = {

	.attrs = ata_ncq_sdev_attrs

};



const struct attribute_group *ata_ncq_sdev_groups[] = {

	&ata_ncq_sdev_attr_group,

	NULL

};

EXPORT_SYMBOL_GPL(ata_ncq_sdev_groups);



static ssize_t

ata_scsi_em_message_store(struct device *dev, struct device_attribute *attr,

drivers/ata/libata-scsi.c

+12 −3
Original line number Diff line number Diff line
@@ -234,11 +234,20 @@ static void ata_scsi_set_invalid_parameter(struct ata_device *dev, 
				     field, 0xff, 0);

}



struct device_attribute *ata_common_sdev_attrs[] = {

	&dev_attr_unload_heads,

static struct attribute *ata_common_sdev_attrs[] = {

	&dev_attr_unload_heads.attr,

	NULL

};

EXPORT_SYMBOL_GPL(ata_common_sdev_attrs);



static const struct attribute_group ata_common_sdev_attr_group = {

	.attrs = ata_common_sdev_attrs

};



const struct attribute_group *ata_common_sdev_groups[] = {

	&ata_common_sdev_attr_group,

	NULL

};

EXPORT_SYMBOL_GPL(ata_common_sdev_groups);



/**

 *	ata_std_bios_param - generic bios head/sector/cylinder calculator used by sd.