scsi: ncr53c8xx: Switch to attribute groups
authorBart Van Assche <bvanassche@acm.org>
Tue, 12 Oct 2021 23:35:45 +0000 (16:35 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sun, 17 Oct 2021 01:45:57 +0000 (21:45 -0400)
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-34-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ncr53c8xx.c

index 168b854..fc8abe0 100644 (file)
@@ -8039,11 +8039,13 @@ static struct device_attribute ncr53c8xx_revision_attr = {
        .show   = show_ncr53c8xx_revision,
 };
   
-static struct device_attribute *ncr53c8xx_host_attrs[] = {
-       &ncr53c8xx_revision_attr,
+static struct attribute *ncr53c8xx_host_attrs[] = {
+       &ncr53c8xx_revision_attr.attr,
        NULL
 };
 
+ATTRIBUTE_GROUPS(ncr53c8xx_host);
+
 /*==========================================================
 **
 **     Boot command line.
@@ -8085,8 +8087,8 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
 
        if (!tpnt->name)
                tpnt->name      = SCSI_NCR_DRIVER_NAME;
-       if (!tpnt->shost_attrs)
-               tpnt->shost_attrs = ncr53c8xx_host_attrs;
+       if (!tpnt->shost_groups)
+               tpnt->shost_groups = ncr53c8xx_host_groups;
 
        tpnt->queuecommand      = ncr53c8xx_queue_command;
        tpnt->slave_configure   = ncr53c8xx_slave_configure;