Commit 90cb6538 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen

scsi: 53c700: 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-11-bvanassche@acm.orgSigned-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 65bc2a7f
...@@ -163,7 +163,7 @@ STATIC int NCR_700_slave_configure(struct scsi_device *SDpnt); ...@@ -163,7 +163,7 @@ STATIC int NCR_700_slave_configure(struct scsi_device *SDpnt);
STATIC void NCR_700_slave_destroy(struct scsi_device *SDpnt); STATIC void NCR_700_slave_destroy(struct scsi_device *SDpnt);
static int NCR_700_change_queue_depth(struct scsi_device *SDpnt, int depth); static int NCR_700_change_queue_depth(struct scsi_device *SDpnt, int depth);
STATIC struct device_attribute *NCR_700_dev_attrs[]; STATIC const struct attribute_group *NCR_700_dev_groups[];
STATIC struct scsi_transport_template *NCR_700_transport_template = NULL; STATIC struct scsi_transport_template *NCR_700_transport_template = NULL;
...@@ -300,8 +300,8 @@ NCR_700_detect(struct scsi_host_template *tpnt, ...@@ -300,8 +300,8 @@ NCR_700_detect(struct scsi_host_template *tpnt,
static int banner = 0; static int banner = 0;
int j; int j;
if(tpnt->sdev_attrs == NULL) if (tpnt->sdev_groups == NULL)
tpnt->sdev_attrs = NCR_700_dev_attrs; tpnt->sdev_groups = NCR_700_dev_groups;
memory = dma_alloc_coherent(dev, TOTAL_MEM_SIZE, &pScript, GFP_KERNEL); memory = dma_alloc_coherent(dev, TOTAL_MEM_SIZE, &pScript, GFP_KERNEL);
if (!memory) { if (!memory) {
...@@ -2085,11 +2085,13 @@ static struct device_attribute NCR_700_active_tags_attr = { ...@@ -2085,11 +2085,13 @@ static struct device_attribute NCR_700_active_tags_attr = {
.show = NCR_700_show_active_tags, .show = NCR_700_show_active_tags,
}; };
STATIC struct device_attribute *NCR_700_dev_attrs[] = { STATIC struct attribute *NCR_700_dev_attrs[] = {
&NCR_700_active_tags_attr, &NCR_700_active_tags_attr.attr,
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(NCR_700_dev);
EXPORT_SYMBOL(NCR_700_detect); EXPORT_SYMBOL(NCR_700_detect);
EXPORT_SYMBOL(NCR_700_release); EXPORT_SYMBOL(NCR_700_release);
EXPORT_SYMBOL(NCR_700_intr); EXPORT_SYMBOL(NCR_700_intr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment