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

scsi: arcmsr: 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-13-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 bd16d711

drivers/scsi/arcmsr/arcmsr.h

+1 −1
Original line number Diff line number Diff line
@@ -1041,6 +1041,6 @@ extern uint32_t arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *, 
	struct QBUFFER __iomem *);

extern void arcmsr_clear_iop2drv_rqueue_buffer(struct AdapterControlBlock *);

extern struct QBUFFER __iomem *arcmsr_get_iop_rqbuffer(struct AdapterControlBlock *);

extern struct device_attribute *arcmsr_host_attrs[];

extern const struct attribute_group *arcmsr_host_groups[];

extern int arcmsr_alloc_sysfs_attr(struct AdapterControlBlock *);

void arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb);

drivers/scsi/arcmsr/arcmsr_attr.c

+20 −13
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ 
#include <scsi/scsi_transport.h>

#include "arcmsr.h"



struct device_attribute *arcmsr_host_attrs[];



static ssize_t arcmsr_sysfs_iop_message_read(struct file *filp,

					     struct kobject *kobj,

					     struct bin_attribute *bin,
@@ -389,16 +387,25 @@ static DEVICE_ATTR(host_fw_numbers_queue, S_IRUGO, arcmsr_attr_host_fw_numbers_q 
static DEVICE_ATTR(host_fw_sdram_size, S_IRUGO, arcmsr_attr_host_fw_sdram_size, NULL);

static DEVICE_ATTR(host_fw_hd_channels, S_IRUGO, arcmsr_attr_host_fw_hd_channels, NULL);



struct device_attribute *arcmsr_host_attrs[] = {

	&dev_attr_host_driver_version,

	&dev_attr_host_driver_posted_cmd,

	&dev_attr_host_driver_reset,

	&dev_attr_host_driver_abort,

	&dev_attr_host_fw_model,

	&dev_attr_host_fw_version,

	&dev_attr_host_fw_request_len,

	&dev_attr_host_fw_numbers_queue,

	&dev_attr_host_fw_sdram_size,

	&dev_attr_host_fw_hd_channels,

static struct attribute *arcmsr_host_attrs[] = {

	&dev_attr_host_driver_version.attr,

	&dev_attr_host_driver_posted_cmd.attr,

	&dev_attr_host_driver_reset.attr,

	&dev_attr_host_driver_abort.attr,

	&dev_attr_host_fw_model.attr,

	&dev_attr_host_fw_version.attr,

	&dev_attr_host_fw_request_len.attr,

	&dev_attr_host_fw_numbers_queue.attr,

	&dev_attr_host_fw_sdram_size.attr,

	&dev_attr_host_fw_hd_channels.attr,

	NULL,

};



static const struct attribute_group arcmsr_host_attr_group = {

	.attrs = arcmsr_host_attrs,

};



const struct attribute_group *arcmsr_host_groups[] = {

	&arcmsr_host_attr_group,

	NULL

};

drivers/scsi/arcmsr/arcmsr_hba.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static struct scsi_host_template arcmsr_scsi_host_template = { 
	.sg_tablesize	        = ARCMSR_DEFAULT_SG_ENTRIES,

	.max_sectors		= ARCMSR_MAX_XFER_SECTORS_C,

	.cmd_per_lun		= ARCMSR_DEFAULT_CMD_PERLUN,

	.shost_attrs		= arcmsr_host_attrs,

	.shost_groups		= arcmsr_host_groups,

	.no_write_same		= 1,

};