From patchwork Thu Oct 7 21:18:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543443 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3B6CC433EF for ; Thu, 7 Oct 2021 21:19:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F7E6610A0 for ; Thu, 7 Oct 2021 21:19:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234018AbhJGVU5 (ORCPT ); Thu, 7 Oct 2021 17:20:57 -0400 Received: from mail-pj1-f44.google.com ([209.85.216.44]:45628 "EHLO mail-pj1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233283AbhJGVU5 (ORCPT ); Thu, 7 Oct 2021 17:20:57 -0400 Received: by mail-pj1-f44.google.com with SMTP id ls14-20020a17090b350e00b001a00e2251c8so6188150pjb.4 for ; Thu, 07 Oct 2021 14:19:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kt2zmEnNC8kSXDLhEYevleO6rodk/ecgntNNeLHdi2w=; b=qwe7ZbmLgBLQEUmW2l5z1F3ZcWeos9bmt6rYnQwaNjxov+IdUwVxrJ1g4OweECVMkm +kZ5wxj610IJhCjkOW2nV88CKom8zPDrRQlvNe4xbtm+ZAGlnigh6+bCUb+baaMKzdno HeYDDmxFILmw1jlTFGfdREFVIv7k8Wwy28LMHds9T8FZNaQzfqzo8iYbEh72jXStXMlV 9Nu9uZ6mB6F7ptTpGe7UGR7nYHS+f6mMzVUfAxNoQP1m1trmugPq8pZ0daLq0WzuHDta eOis2pslxdCkt/rwzAAP0GpJEDDUdvckoGGlnMCjbK0J43fpVD+a8+hzQLF9QiXUl/Pb DVWw== X-Gm-Message-State: AOAM5334uhiKtPpRKuNN47EidEfLUs10GOySi0nghuYKXTSoP7+PoHMP jmSOgvnFVVBqjh97rSoOrC4= X-Google-Smtp-Source: ABdhPJzGNFte1mriNFCUpldNsgtmi4PP8YXRxEgeAT/N5tN7xccSYtW08jG5nYMKujQqZxWMKadeZQ== X-Received: by 2002:a17:902:7c8d:b0:13a:768b:d6c0 with SMTP id y13-20020a1709027c8d00b0013a768bd6c0mr6024177pll.83.1633641542615; Thu, 07 Oct 2021 14:19:02 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:02 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Greg Kroah-Hartman , "James E.J. Bottomley" Subject: [PATCH v2 01/46] scsi: core: Register sysfs attributes earlier Date: Thu, 7 Oct 2021 14:18:07 -0700 Message-Id: <20211007211852.256007-2-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org A quote from Documentation/driver-api/driver-model/device.rst: "Word of warning: While the kernel allows device_create_file() and device_remove_file() to be called on a device at any time, userspace has strict expectations on when attributes get created. When a new device is registered in the kernel, a uevent is generated to notify userspace (like udev) that a new device is available. If attributes are added after the device is registered, then userspace won't get notified and userspace will not know about the new attributes." Hence register SCSI host sysfs attributes before the SCSI host shost_dev uevent is emitted instead of after that event has been emitted. Cc: Greg Kroah-Hartman Signed-off-by: Bart Van Assche --- drivers/scsi/hosts.c | 23 ++++++++++- drivers/scsi/scsi_priv.h | 4 +- drivers/scsi/scsi_sysfs.c | 81 +++++++++++++++++++------------------- include/scsi/scsi_device.h | 7 ++++ include/scsi/scsi_host.h | 12 ++++++ 5 files changed, 84 insertions(+), 43 deletions(-) diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 3f6f14f0cafb..3443f009a9e8 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -376,7 +376,7 @@ static struct device_type scsi_host_type = { struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) { struct Scsi_Host *shost; - int index; + int index, i, j = 0; shost = kzalloc(sizeof(struct Scsi_Host) + privsize, GFP_KERNEL); if (!shost) @@ -480,7 +480,26 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) shost->shost_dev.parent = &shost->shost_gendev; shost->shost_dev.class = &shost_class; dev_set_name(&shost->shost_dev, "host%d", shost->host_no); - shost->shost_dev.groups = scsi_sysfs_shost_attr_groups; + shost->shost_dev.groups = shost->shost_dev_attr_groups; + shost->shost_dev_attr_groups[j++] = &scsi_shost_attr_group; + if (sht->shost_attrs) { + shost->lld_attr_group = (struct attribute_group){ + .attrs = scsi_convert_dev_attrs(&shost->shost_gendev, + sht->shost_attrs) + }; + if (shost->lld_attr_group.attrs) + shost->shost_dev_attr_groups[j++] = + &shost->lld_attr_group; + } + if (sht->shost_groups) { + for (i = 0; sht->shost_groups[i] && + j < ARRAY_SIZE(shost->shost_dev_attr_groups); + i++, j++) { + shost->shost_dev_attr_groups[j] = + sht->shost_groups[i]; + } + } + WARN_ON_ONCE(j >= ARRAY_SIZE(shost->shost_dev_attr_groups)); shost->ehandler = kthread_run(scsi_error_handler, shost, "scsi_eh_%d", shost->host_no); diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index 6d9152031a40..a5a2f18cc734 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h @@ -137,13 +137,15 @@ extern int scsi_sysfs_add_sdev(struct scsi_device *); extern int scsi_sysfs_add_host(struct Scsi_Host *); extern int scsi_sysfs_register(void); extern void scsi_sysfs_unregister(void); +struct attribute **scsi_convert_dev_attrs(struct device *dev, + struct device_attribute **dev_attr); extern void scsi_sysfs_device_initialize(struct scsi_device *); extern int scsi_sysfs_target_initialize(struct scsi_device *); extern struct scsi_transport_template blank_transport_template; extern void __scsi_remove_device(struct scsi_device *); extern struct bus_type scsi_bus_type; -extern const struct attribute_group *scsi_sysfs_shost_attr_groups[]; +extern const struct attribute_group scsi_shost_attr_group; /* scsi_netlink.c */ #ifdef CONFIG_SCSI_NETLINK diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 86793259e541..05b4d69d53d4 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -424,15 +424,10 @@ static struct attribute *scsi_sysfs_shost_attrs[] = { NULL }; -static struct attribute_group scsi_shost_attr_group = { +const struct attribute_group scsi_shost_attr_group = { .attrs = scsi_sysfs_shost_attrs, }; -const struct attribute_group *scsi_sysfs_shost_attr_groups[] = { - &scsi_shost_attr_group, - NULL -}; - static void scsi_device_cls_release(struct device *class_dev) { struct scsi_device *sdev; @@ -1333,7 +1328,7 @@ static int scsi_target_add(struct scsi_target *starget) **/ int scsi_sysfs_add_sdev(struct scsi_device *sdev) { - int error, i; + int error; struct scsi_target *starget = sdev->sdev_target; error = scsi_target_add(starget); @@ -1386,23 +1381,6 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) } } - /* add additional host specific attributes */ - if (sdev->host->hostt->sdev_attrs) { - for (i = 0; sdev->host->hostt->sdev_attrs[i]; i++) { - error = device_create_file(&sdev->sdev_gendev, - sdev->host->hostt->sdev_attrs[i]); - if (error) - return error; - } - } - - if (sdev->host->hostt->sdev_groups) { - error = sysfs_create_groups(&sdev->sdev_gendev.kobj, - sdev->host->hostt->sdev_groups); - if (error) - return error; - } - scsi_autopm_put_device(sdev); return error; } @@ -1442,10 +1420,6 @@ void __scsi_remove_device(struct scsi_device *sdev) if (res != 0) return; - if (sdev->host->hostt->sdev_groups) - sysfs_remove_groups(&sdev->sdev_gendev.kobj, - sdev->host->hostt->sdev_groups); - if (IS_ENABLED(CONFIG_BLK_DEV_BSG) && sdev->bsg_dev) bsg_unregister_queue(sdev->bsg_dev); device_unregister(&sdev->sdev_dev); @@ -1584,23 +1558,31 @@ EXPORT_SYMBOL(scsi_register_interface); **/ int scsi_sysfs_add_host(struct Scsi_Host *shost) { - int error, i; - - /* add host specific attributes */ - if (shost->hostt->shost_attrs) { - for (i = 0; shost->hostt->shost_attrs[i]; i++) { - error = device_create_file(&shost->shost_dev, - shost->hostt->shost_attrs[i]); - if (error) - return error; - } - } - transport_register_device(&shost->shost_gendev); transport_configure_device(&shost->shost_gendev); return 0; } +/* + * Convert an array of struct device_attribute pointers into an array of + * struct attribute pointers. + */ +struct attribute **scsi_convert_dev_attrs(struct device *dev, + struct device_attribute **dev_attr) +{ + struct attribute **attrs; + int i; + + for (i = 0; dev_attr[i]; i++) + ; + attrs = devm_kzalloc(dev, (i + 1) * sizeof(*attrs), GFP_KERNEL); + if (!attrs) + return NULL; + for (i = 0; dev_attr[i]; i++) + attrs[i] = &dev_attr[i]->attr; + return attrs; +} + static struct device_type scsi_dev_type = { .name = "scsi_device", .release = scsi_device_dev_release, @@ -1609,8 +1591,10 @@ static struct device_type scsi_dev_type = { void scsi_sysfs_device_initialize(struct scsi_device *sdev) { + int i, j = 0; unsigned long flags; struct Scsi_Host *shost = sdev->host; + struct scsi_host_template *hostt = shost->hostt; struct scsi_target *starget = sdev->sdev_target; device_initialize(&sdev->sdev_gendev); @@ -1618,6 +1602,23 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev) sdev->sdev_gendev.type = &scsi_dev_type; dev_set_name(&sdev->sdev_gendev, "%d:%d:%d:%llu", sdev->host->host_no, sdev->channel, sdev->id, sdev->lun); + sdev->gendev_attr_groups[j++] = &scsi_sdev_attr_group; + if (hostt->sdev_attrs) { + sdev->lld_attr_group = (struct attribute_group){ + .attrs = scsi_convert_dev_attrs(&sdev->sdev_gendev, + hostt->sdev_attrs) + }; + if (sdev->lld_attr_group.attrs) + sdev->gendev_attr_groups[j++] = &sdev->lld_attr_group; + } + if (hostt->sdev_groups) { + for (i = 0; hostt->sdev_groups[i] && + j < ARRAY_SIZE(sdev->gendev_attr_groups); + i++, j++) { + sdev->gendev_attr_groups[j] = hostt->sdev_groups[i]; + } + } + WARN_ON_ONCE(j >= ARRAY_SIZE(sdev->gendev_attr_groups)); device_initialize(&sdev->sdev_dev); sdev->sdev_dev.parent = get_device(&sdev->sdev_gendev); diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index b97e142a7ca9..01732aabd7c3 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -225,6 +225,13 @@ struct scsi_device { struct device sdev_gendev, sdev_dev; + struct attribute_group lld_attr_group; + /* + * The array size 6 provides space for one attribute group for the + * SCSI core, four attribute groups defined by SCSI LLDs and one + * terminating NULL pointer. + */ + const struct attribute_group *gendev_attr_groups[6]; struct execute_work ew; /* used to get process context on put */ struct work_struct requeue_work; diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index bc9c45ced145..ab8775811e6f 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -483,6 +483,11 @@ struct scsi_host_template { */ struct device_attribute **sdev_attrs; + /* + * Pointer to the SCSI host sysfs attribute groups, NULL terminated. + */ + const struct attribute_group **shost_groups; + /* * Pointer to the SCSI device attribute groups for this host, * NULL terminated. @@ -695,6 +700,13 @@ struct Scsi_Host { /* ldm bits */ struct device shost_gendev, shost_dev; + struct attribute_group lld_attr_group; + /* + * The array size 3 provides space for one attribute group defined by + * the SCSI core, one attribute group defined by the SCSI LLD and one + * terminating NULL pointer. + */ + const struct attribute_group *shost_dev_attr_groups[3]; /* * Points to the transport data (if any) which is allocated From patchwork Thu Oct 7 21:18:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543445 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74711C433EF for ; Thu, 7 Oct 2021 21:19:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53FE561130 for ; Thu, 7 Oct 2021 21:19:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234057AbhJGVVA (ORCPT ); Thu, 7 Oct 2021 17:21:00 -0400 Received: from mail-pj1-f48.google.com ([209.85.216.48]:53953 "EHLO mail-pj1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233283AbhJGVU7 (ORCPT ); Thu, 7 Oct 2021 17:20:59 -0400 Received: by mail-pj1-f48.google.com with SMTP id ls18so5900089pjb.3 for ; Thu, 07 Oct 2021 14:19:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8i7wrJKoNirhr+hHHb7KuJOmht99FU5BcbDnKqGMb5U=; b=fWPW7DZFlXgHiYSxnUQ+sSo7bdYnnY9rJ5z4d95QcQzkL6aCkq1vaYfQyAgcgufzP5 tywEzlXPkOMDePivZzxGGVhIPQx15EefPxb2XxJ0QhxD0Z0IfJnZ9FPSjZGym9DPa+L1 Xse9TFPRpsLQ5jV4wQRpAyzNAtbkkdozlY22ZyBPx2NB5ZHGMtgbv2g0p4CqtIez/uGt ZR/c1Oy21BQBhnfrDjLJ+DGoe3EHA0PhaGajYQhAxFlnhmgRNdez/T5VLuJY9RagGjeC JAAt+UtdTStIvPGzTVvOs9gAgNVbZO1bkB5vCsvPy2z0cHlsuibV96S4xYvIv/TPzJ/I AEiA== X-Gm-Message-State: AOAM530hYhCGguSFW5SkutaGDDjydnXVS5zmYSUsGIx4W/Biag5elL0X At/AfRm9swrgsjFZ8iAHRnk= X-Google-Smtp-Source: ABdhPJzsCc7WvUA8I+19phnE0rCpsPkHWf6fb6XyDzP2/lB/V5FMoLUQOkwxNJ+zhlRpa8Vg2G5MNQ== X-Received: by 2002:a17:90a:4e43:: with SMTP id t3mr8061673pjl.163.1633641545093; Thu, 07 Oct 2021 14:19:05 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:04 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Damien Le Moal Subject: [PATCH v2 02/46] ata: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:08 -0700 Message-Id: <20211007211852.256007-3-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/ata/ahci.h | 8 +++--- drivers/ata/ata_piix.c | 15 ++++++++--- drivers/ata/libahci.c | 52 ++++++++++++++++++++++++++------------- drivers/ata/libata-sata.c | 19 ++++++++++---- drivers/ata/libata-scsi.c | 15 ++++++++--- drivers/ata/pata_macio.c | 2 +- drivers/ata/sata_mv.c | 2 +- drivers/ata/sata_nv.c | 4 +-- drivers/ata/sata_sil24.c | 2 +- include/linux/libata.h | 8 +++--- 10 files changed, 86 insertions(+), 41 deletions(-) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 2e89499bd9c3..ef77b6551382 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -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_attr_groups[]; +extern const struct attribute_group *ahci_sdev_attr_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_attr_groups, \ + .sdev_groups = ahci_sdev_attr_groups, \ .change_queue_depth = ata_scsi_change_queue_depth, \ .tag_alloc_policy = BLK_TAG_ALLOC_RR, \ .slave_configure = ata_scsi_slave_config diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 3ca7720e7d8f..f845cee501e8 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -1085,14 +1085,23 @@ 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 +}; + +static const struct attribute_group piix_sidpr_shost_attr_group = { + .attrs = piix_sidpr_shost_attrs +}; + +static const struct attribute_group *piix_sidpr_shost_groups[] = { + &piix_sidpr_shost_attr_group, NULL }; 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 = { diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 5b3fa2cbe722..ebf990944054 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -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_attr_groups[] = { + &ahci_shost_attr_group, + NULL +}; +EXPORT_SYMBOL_GPL(ahci_shost_attr_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_attr_groups[] = { + &ahci_sdev_attr_group, NULL }; -EXPORT_SYMBOL_GPL(ahci_sdev_attrs); +EXPORT_SYMBOL_GPL(ahci_sdev_attr_groups); struct ata_port_operations ahci_ops = { .inherits = &sata_pmp_port_ops, diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c index 8f3ff830ab0c..0d332b40ec42 100644 --- a/drivers/ata/libata-sata.c +++ b/drivers/ata/libata-sata.c @@ -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_attr_groups[] = { + &ata_ncq_sdev_attr_group, + NULL +}; +EXPORT_SYMBOL_GPL(ata_ncq_sdev_attr_groups); static ssize_t ata_scsi_em_message_store(struct device *dev, struct device_attribute *attr, diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 1fb4611f7eeb..84c696960f4c 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -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_attr_groups[] = { + &ata_common_sdev_attr_group, + NULL +}; +EXPORT_SYMBOL_GPL(ata_common_sdev_attr_groups); /** * ata_std_bios_param - generic bios head/sector/cylinder calculator used by sd. diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index be0ca8d5b345..a7a6a26175fe 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c @@ -923,7 +923,7 @@ static struct scsi_host_template pata_macio_sht = { */ .max_segment_size = MAX_DBDMA_SEG, .slave_configure = pata_macio_slave_config, - .sdev_attrs = ata_common_sdev_attrs, + .sdev_groups = ata_common_sdev_attr_groups, .can_queue = ATA_DEF_QUEUE, .tag_alloc_policy = BLK_TAG_ALLOC_RR, }; diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 9d86203e1e7a..35a97b7c2791 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -670,7 +670,7 @@ static struct scsi_host_template mv6_sht = { .can_queue = MV_MAX_Q_DEPTH - 1, .sg_tablesize = MV_MAX_SG_CT / 2, .dma_boundary = MV_DMA_BOUNDARY, - .sdev_attrs = ata_ncq_sdev_attrs, + .sdev_groups = ata_ncq_sdev_attr_groups, .change_queue_depth = ata_scsi_change_queue_depth, .tag_alloc_policy = BLK_TAG_ALLOC_RR, .slave_configure = ata_scsi_slave_config diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index c385d18ce87b..7ff1a2f30cea 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c @@ -380,7 +380,7 @@ static struct scsi_host_template nv_adma_sht = { .sg_tablesize = NV_ADMA_SGTBL_TOTAL_LEN, .dma_boundary = NV_ADMA_DMA_BOUNDARY, .slave_configure = nv_adma_slave_config, - .sdev_attrs = ata_ncq_sdev_attrs, + .sdev_groups = ata_ncq_sdev_attr_groups, .change_queue_depth = ata_scsi_change_queue_depth, .tag_alloc_policy = BLK_TAG_ALLOC_RR, }; @@ -391,7 +391,7 @@ static struct scsi_host_template nv_swncq_sht = { .sg_tablesize = LIBATA_MAX_PRD, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = nv_swncq_slave_config, - .sdev_attrs = ata_ncq_sdev_attrs, + .sdev_groups = ata_ncq_sdev_attr_groups, .change_queue_depth = ata_scsi_change_queue_depth, .tag_alloc_policy = BLK_TAG_ALLOC_RR, }; diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 06a1e27c4f84..ada0dbb9f703 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c @@ -379,7 +379,7 @@ static struct scsi_host_template sil24_sht = { .sg_tablesize = SIL24_MAX_SGE, .dma_boundary = ATA_DMA_BOUNDARY, .tag_alloc_policy = BLK_TAG_ALLOC_FIFO, - .sdev_attrs = ata_ncq_sdev_attrs, + .sdev_groups = ata_ncq_sdev_attr_groups, .change_queue_depth = ata_scsi_change_queue_depth, .slave_configure = ata_scsi_slave_config }; diff --git a/include/linux/libata.h b/include/linux/libata.h index c0c64f03e107..6df8d0034d77 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -1388,7 +1388,7 @@ extern int ata_link_nr_enabled(struct ata_link *link); */ extern const struct ata_port_operations ata_base_port_ops; extern const struct ata_port_operations sata_port_ops; -extern struct device_attribute *ata_common_sdev_attrs[]; +extern const struct attribute_group *ata_common_sdev_attr_groups[]; /* * All sht initializers (BASE, PIO, BMDMA, NCQ) must be instantiated @@ -1418,14 +1418,14 @@ extern struct device_attribute *ata_common_sdev_attrs[]; #define ATA_BASE_SHT(drv_name) \ ATA_SUBBASE_SHT(drv_name), \ - .sdev_attrs = ata_common_sdev_attrs + .sdev_groups = ata_common_sdev_attr_groups #ifdef CONFIG_SATA_HOST -extern struct device_attribute *ata_ncq_sdev_attrs[]; +extern const struct attribute_group *ata_ncq_sdev_attr_groups[]; #define ATA_NCQ_SHT(drv_name) \ ATA_SUBBASE_SHT(drv_name), \ - .sdev_attrs = ata_ncq_sdev_attrs, \ + .sdev_groups = ata_ncq_sdev_attr_groups, \ .change_queue_depth = ata_scsi_change_queue_depth #endif From patchwork Thu Oct 7 21:18:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543447 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52203C433FE for ; Thu, 7 Oct 2021 21:19:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 313C061130 for ; Thu, 7 Oct 2021 21:19:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234044AbhJGVVB (ORCPT ); Thu, 7 Oct 2021 17:21:01 -0400 Received: from mail-pj1-f50.google.com ([209.85.216.50]:40651 "EHLO mail-pj1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234054AbhJGVVA (ORCPT ); Thu, 7 Oct 2021 17:21:00 -0400 Received: by mail-pj1-f50.google.com with SMTP id pf6-20020a17090b1d8600b0019fa884ab85so7905942pjb.5 for ; Thu, 07 Oct 2021 14:19:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=buSuDP4vBxSyJVBvFp1R+c0HMrmsuxbhAawkNxUQA5M=; b=T6l4Qq4h+hVZDdudHQ9AIwKvSuTDpbvYxmi0s3sJruPQovl7nzZPP7NBhLahBv0QS2 8FUGgBPs3TTbr1J7yqEyQkfOP8tT93bsSLFFU0V1cHN8rIA21eiAjNWwtvAfLwHslsEN HrFg6t712OEwc4Usx4kxCRbDSOQBm/NyagIXKzWEvORVJ3tG7ZH15Aa2UzpKuknVdCPc kvhdc4R/1u4fXimO3tMpdUYUGaMNfDuB/FIwhAtaQD/c/26UdlN+jyZEPHtUZ0Tjq7Td xGC9D96jFjBNqQZZFqnwVgkrdsOGjFSnKBbFW3RYNYeQC0oX6KRamlo99FQey8vCMvU2 RCZQ== X-Gm-Message-State: AOAM5304/3+A9LbLn17UiAnaYvor7R0ldp0QR9yOLgmANUweF3aOujZ7 kpmMkNBGLNFPRLqy24FM2XYQe2FTadRHvQ== X-Google-Smtp-Source: ABdhPJzzCpnQEMiPjmUGyKTXQ76tGiowURjyosOsYC5M8N+mTdyfxdoluVl8J17yNQIQQ7zTzlcRsA== X-Received: by 2002:a17:90a:ab15:: with SMTP id m21mr8034170pjq.166.1633641546437; Thu, 07 Oct 2021 14:19:06 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:05 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Stefan Richter Subject: [PATCH v2 03/46] firewire: sbp2: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:09 -0700 Message-Id: <20211007211852.256007-4-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/firewire/sbp2.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index 4d5054211550..f0fcd81402e3 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c @@ -1578,8 +1578,17 @@ 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 +}; + +static const struct attribute_group sbp2_scsi_sysfs_attr_group = { + .attrs = sbp2_scsi_sysfs_attrs +}; + +static const struct attribute_group *sbp2_scsi_sysfs_attr_groups[] = { + &sbp2_scsi_sysfs_attr_group, NULL }; @@ -1595,7 +1604,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_attr_groups, }; MODULE_AUTHOR("Kristian Hoegsberg "); From patchwork Thu Oct 7 21:18:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543449 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1B70C433F5 for ; Thu, 7 Oct 2021 21:19:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9308061130 for ; Thu, 7 Oct 2021 21:19:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234054AbhJGVVE (ORCPT ); Thu, 7 Oct 2021 17:21:04 -0400 Received: from mail-pg1-f178.google.com ([209.85.215.178]:41564 "EHLO mail-pg1-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234049AbhJGVVC (ORCPT ); Thu, 7 Oct 2021 17:21:02 -0400 Received: by mail-pg1-f178.google.com with SMTP id v11so1025412pgb.8 for ; Thu, 07 Oct 2021 14:19:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZK7eJotaZDZgeIfzkKRbZRNkiJy+HAFbh7qlU1ZIZgw=; b=idmLYq0ARLNI6Cf+HgoAuHGunqmO0H2IIFHmAHSkmCQWexuwG/S3NMu2nToCevbbFb 79ICQjFdSRym3BeUCuLn2SxMiHTxPuaRktjSutwzAKw0QOY0qVUznV8uTE0cngC87s/S fIWAZB/lepu18+7x1Fa2ed/3Jy4Nma3aoHrYJl/SRLhyhggPRu4Cm+7B3WYV0RMki6lz z7whkkFnxujG5tp7V7KRpfBd3K+wNk4QV8RWztMUpqg0q+yRrAYfkDohMjGhaXUkkBkA SMmLfUaXPQ8oHloepEPpzQ9jKk1E5w/OnwAA6qjSQYyIx30qCBGaRV06aBadJIP28KfP wihw== X-Gm-Message-State: AOAM533Cd5aGQx/H119RjZD+1/o0F5YkaZZkVYqnD8GNXlP9pp4d7Ypo AARGiNqS0Qt0+01QMUb6O+kKpOwiNgdRYA== X-Google-Smtp-Source: ABdhPJwCj5yDYQPeGRsB7hY/A+F6PrQvfURHZFoP+Kk0DlW16IL35qz56ECAuOo1Mndl0SpiDLXe3w== X-Received: by 2002:a63:8bc4:: with SMTP id j187mr1515301pge.402.1633641547848; Thu, 07 Oct 2021 14:19:07 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:07 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Doug Ledford , Jason Gunthorpe Subject: [PATCH v2 04/46] RDMA/srp: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:10 -0700 Message-Id: <20211007211852.256007-5-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/infiniband/ulp/srp/ib_srp.c | 58 ++++++++++++++++++----------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 71eda91e810c..8de4d6f6ce9e 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1026,10 +1026,17 @@ static int srp_init_cmd_priv(struct Scsi_Host *shost, struct scsi_cmnd *cmd) */ static void srp_del_scsi_host_attr(struct Scsi_Host *shost) { - struct device_attribute **attr; + const struct attribute_group **g; + struct attribute **attr; - for (attr = shost->hostt->shost_attrs; attr && *attr; ++attr) - device_remove_file(&shost->shost_dev, *attr); + for (g = shost->hostt->shost_groups; *g; ++g) { + for (attr = (*g)->attrs; *attr; ++attr) { + struct device_attribute *dev_attr = + container_of(*attr, typeof(*dev_attr), attr); + + device_remove_file(&shost->shost_dev, dev_attr); + } + } } static void srp_remove_target(struct srp_target_port *target) @@ -3050,23 +3057,32 @@ static ssize_t allow_ext_sg_show(struct device *dev, static DEVICE_ATTR_RO(allow_ext_sg); -static struct device_attribute *srp_host_attrs[] = { - &dev_attr_id_ext, - &dev_attr_ioc_guid, - &dev_attr_service_id, - &dev_attr_pkey, - &dev_attr_sgid, - &dev_attr_dgid, - &dev_attr_orig_dgid, - &dev_attr_req_lim, - &dev_attr_zero_req_lim, - &dev_attr_local_ib_port, - &dev_attr_local_ib_device, - &dev_attr_ch_count, - &dev_attr_comp_vector, - &dev_attr_tl_retry_count, - &dev_attr_cmd_sg_entries, - &dev_attr_allow_ext_sg, +static struct attribute *srp_host_attrs[] = { + &dev_attr_id_ext.attr, + &dev_attr_ioc_guid.attr, + &dev_attr_service_id.attr, + &dev_attr_pkey.attr, + &dev_attr_sgid.attr, + &dev_attr_dgid.attr, + &dev_attr_orig_dgid.attr, + &dev_attr_req_lim.attr, + &dev_attr_zero_req_lim.attr, + &dev_attr_local_ib_port.attr, + &dev_attr_local_ib_device.attr, + &dev_attr_ch_count.attr, + &dev_attr_comp_vector.attr, + &dev_attr_tl_retry_count.attr, + &dev_attr_cmd_sg_entries.attr, + &dev_attr_allow_ext_sg.attr, + NULL +}; + +static const struct attribute_group srp_host_attr_group = { + .attrs = srp_host_attrs +}; + +static const struct attribute_group *srp_host_attr_groups[] = { + &srp_host_attr_group, NULL }; @@ -3090,7 +3106,7 @@ static struct scsi_host_template srp_template = { .can_queue = SRP_DEFAULT_CMD_SQ_SIZE, .this_id = -1, .cmd_per_lun = SRP_DEFAULT_CMD_SQ_SIZE, - .shost_attrs = srp_host_attrs, + .shost_groups = srp_host_attr_groups, .track_queue_depth = 1, .cmd_size = sizeof(struct srp_request), }; From patchwork Thu Oct 7 21:18:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543451 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 883C2C433FE for ; Thu, 7 Oct 2021 21:19:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 72FAE61077 for ; Thu, 7 Oct 2021 21:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234081AbhJGVVF (ORCPT ); Thu, 7 Oct 2021 17:21:05 -0400 Received: from mail-pg1-f182.google.com ([209.85.215.182]:34563 "EHLO mail-pg1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234049AbhJGVVE (ORCPT ); Thu, 7 Oct 2021 17:21:04 -0400 Received: by mail-pg1-f182.google.com with SMTP id 133so1052759pgb.1 for ; Thu, 07 Oct 2021 14:19:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gA6NRNH2A9Xt41KnXTAILbLbUYLHxLunMHE6eX3ZNbw=; b=EqFrSd9fyVH+AmeVUzAapp7o29XC1ao8EdJGLJNsHcKzKEhHO9UrCXt4edPmo+eL56 GWmUx+/DpqcfpQfE0HMzVtJHQEv1gIJLGgVbROCJ8vs4f3WF106mcNz3WNRchUTqrZOE AEFPZ0TW7N1VlbfLygvsbnk6W5RkaEgisLafdITjUW9Oy15wqff/+VUVZGG2+blO0oXM G+mFKEyvdC01Lyfa15fUigfZ+cTjvHvOGQn90dI959IXgsWe7+PDq1pW0m0iHPaUHBf2 HYABv1UGUJ4LCHkYuq5SNha3qKyXoeuQ8lOfCEC3m8YWETLzIA4YmWxC7ObRGtRzMzgn 1VcA== X-Gm-Message-State: AOAM530n6pqPrgq38nHchUo4vkbxRhNmYTccpnxMkJpj/1uFKWwcyPtd svncTtyYY2Kr+dwnjUn0Luh/Hp/I5RYr4A== X-Google-Smtp-Source: ABdhPJxogWfKzyXdSzX7uSIGVrgbr5E4Z0+HFKg17RdX48kN17/tHtM0bmOZEfkFMbb7fZLprHxLSQ== X-Received: by 2002:a63:e057:: with SMTP id n23mr1518174pgj.183.1633641550131; Thu, 07 Oct 2021 14:19:10 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:09 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani Subject: [PATCH v2 05/46] scsi: message: fusion: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:11 -0700 Message-Id: <20211007211852.256007-6-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/message/fusion/mptfc.c | 2 +- drivers/message/fusion/mptsas.c | 2 +- drivers/message/fusion/mptscsih.c | 36 +++++++++++++++++++------------ drivers/message/fusion/mptscsih.h | 2 +- drivers/message/fusion/mptspi.c | 2 +- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index 572333fadd68..ecca95d2b9bf 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c @@ -129,7 +129,7 @@ static struct scsi_host_template mptfc_driver_template = { .sg_tablesize = MPT_SCSI_SG_DEPTH, .max_sectors = 8192, .cmd_per_lun = 7, - .shost_attrs = mptscsih_host_attrs, + .shost_groups = mptscsih_host_attr_groups, }; /**************************************************************************** diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 85285ba8e817..e31167446a02 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -2020,7 +2020,7 @@ static struct scsi_host_template mptsas_driver_template = { .sg_tablesize = MPT_SCSI_SG_DEPTH, .max_sectors = 8192, .cmd_per_lun = 7, - .shost_attrs = mptscsih_host_attrs, + .shost_groups = mptscsih_host_attr_groups, .no_write_same = 1, }; diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index ce2e5b21978e..03573670c395 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c @@ -3218,23 +3218,31 @@ mptscsih_debug_level_store(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR(debug_level, S_IRUGO | S_IWUSR, mptscsih_debug_level_show, mptscsih_debug_level_store); -struct device_attribute *mptscsih_host_attrs[] = { - &dev_attr_version_fw, - &dev_attr_version_bios, - &dev_attr_version_mpi, - &dev_attr_version_product, - &dev_attr_version_nvdata_persistent, - &dev_attr_version_nvdata_default, - &dev_attr_board_name, - &dev_attr_board_assembly, - &dev_attr_board_tracer, - &dev_attr_io_delay, - &dev_attr_device_delay, - &dev_attr_debug_level, +static struct attribute *mptscsih_host_attrs[] = { + &dev_attr_version_fw.attr, + &dev_attr_version_bios.attr, + &dev_attr_version_mpi.attr, + &dev_attr_version_product.attr, + &dev_attr_version_nvdata_persistent.attr, + &dev_attr_version_nvdata_default.attr, + &dev_attr_board_name.attr, + &dev_attr_board_assembly.attr, + &dev_attr_board_tracer.attr, + &dev_attr_io_delay.attr, + &dev_attr_device_delay.attr, + &dev_attr_debug_level.attr, NULL, }; -EXPORT_SYMBOL(mptscsih_host_attrs); +static const struct attribute_group mptscsih_host_attr_group = { + .attrs = mptscsih_host_attrs +}; + +const struct attribute_group *mptscsih_host_attr_groups[] = { + &mptscsih_host_attr_group, + NULL +}; +EXPORT_SYMBOL(mptscsih_host_attr_groups); EXPORT_SYMBOL(mptscsih_remove); EXPORT_SYMBOL(mptscsih_shutdown); diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h index 2baeefd9be7a..a22c5eaf703c 100644 --- a/drivers/message/fusion/mptscsih.h +++ b/drivers/message/fusion/mptscsih.h @@ -131,7 +131,7 @@ extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset); extern int mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth); extern u8 mptscsih_raid_id_to_num(MPT_ADAPTER *ioc, u8 channel, u8 id); extern int mptscsih_is_phys_disk(MPT_ADAPTER *ioc, u8 channel, u8 id); -extern struct device_attribute *mptscsih_host_attrs[]; +extern const struct attribute_group *mptscsih_host_attr_groups[]; extern struct scsi_cmnd *mptscsih_get_scsi_lookup(MPT_ADAPTER *ioc, int i); extern void mptscsih_taskmgmt_response_code(MPT_ADAPTER *ioc, u8 response_code); extern void mptscsih_flush_running_cmds(MPT_SCSI_HOST *hd); diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index af0ce5611e4a..63c25877a413 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -843,7 +843,7 @@ static struct scsi_host_template mptspi_driver_template = { .sg_tablesize = MPT_SCSI_SG_DEPTH, .max_sectors = 8192, .cmd_per_lun = 7, - .shost_attrs = mptscsih_host_attrs, + .shost_groups = mptscsih_host_attr_groups, }; static int mptspi_write_spi_device_pg1(struct scsi_target *starget, From patchwork Thu Oct 7 21:18:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543453 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFCCBC433F5 for ; Thu, 7 Oct 2021 21:19:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5F51610A5 for ; Thu, 7 Oct 2021 21:19:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234337AbhJGVVJ (ORCPT ); Thu, 7 Oct 2021 17:21:09 -0400 Received: from mail-pg1-f171.google.com ([209.85.215.171]:47075 "EHLO mail-pg1-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233710AbhJGVVG (ORCPT ); Thu, 7 Oct 2021 17:21:06 -0400 Received: by mail-pg1-f171.google.com with SMTP id m21so1009021pgu.13 for ; Thu, 07 Oct 2021 14:19:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R6I1I5eX1La02qCMMnkH/r3EBmKBKA7fd7ebgjOp0Do=; b=ZiNKtyBmOlMwJZZX3nF7a0cwPsFU3axfbYMkSlIEYWfR5N0CqEVmIHTtxxmdXhply7 5spcjOG4DOh2uI0KMXsljhKVtHjewiRXiOf4iayYSNctCi3fKcuv1PBIWHLjQ3XbpinE r388S1el06pVxU/AloqhuSAh4zdcPYa+pbN8FYgF0g1WnLydpXX029j3xhRCAGjepcXj L0Wl5PmW2qE06kX6W5dgi0DEDYLfdBn5WNwd/HC2clJ6oBIxGSX4eh8UqmtmJRnkr7ub TDy/Gg4RuOF5gBwVNsVxHWd/VyN9TpfviPqb/NKlD3lSTWdqDmFe4ThqzjE2pe2/q/Ku QwyA== X-Gm-Message-State: AOAM533VFuQZXGoTrI4nMzG1R8HAAn82Q+7UPUhROeWMJ2YE4vaf4qrU 22YxDzPdHmNeD2laxn9jKS4= X-Google-Smtp-Source: ABdhPJxe3OB6JiAPvyRdU/POoCcQpzW/aXbOmLz7l55MlmzzpVoc84S5kQRmEWfG9LJ5DuZFoyFgbA== X-Received: by 2002:a63:cc48:: with SMTP id q8mr1486232pgi.171.1633641551988; Thu, 07 Oct 2021 14:19:11 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:11 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Steffen Maier , Benjamin Block , Heiko Carstens , Vasily Gorbik , Christian Borntraeger Subject: [PATCH v2 06/46] scsi: zfcp: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:12 -0700 Message-Id: <20211007211852.256007-7-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/s390/scsi/zfcp_ext.h | 4 +-- drivers/s390/scsi/zfcp_scsi.c | 4 +-- drivers/s390/scsi/zfcp_sysfs.c | 52 +++++++++++++++++++++++----------- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index 6bc96d70254d..87a35a755464 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h @@ -184,8 +184,8 @@ extern const struct attribute_group *zfcp_sysfs_adapter_attr_groups[]; extern const struct attribute_group *zfcp_unit_attr_groups[]; extern const struct attribute_group *zfcp_port_attr_groups[]; extern struct mutex zfcp_sysfs_port_units_mutex; -extern struct device_attribute *zfcp_sysfs_sdev_attrs[]; -extern struct device_attribute *zfcp_sysfs_shost_attrs[]; +extern const struct attribute_group *zfcp_sysfs_sdev_attr_groups[]; +extern const struct attribute_group *zfcp_shost_attr_groups[]; bool zfcp_sysfs_port_is_removing(const struct zfcp_port *const port); /* zfcp_unit.c */ diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index 9da9b2b2a580..875d14489699 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c @@ -444,8 +444,8 @@ static struct scsi_host_template zfcp_scsi_host_template = { /* report size limit per scatter-gather segment */ .max_segment_size = ZFCP_QDIO_SBALE_LEN, .dma_boundary = ZFCP_QDIO_SBALE_LEN - 1, - .shost_attrs = zfcp_sysfs_shost_attrs, - .sdev_attrs = zfcp_sysfs_sdev_attrs, + .shost_groups = zfcp_shost_attr_groups, + .sdev_groups = zfcp_sysfs_sdev_attr_groups, .track_queue_depth = 1, .supported_mode = MODE_INITIATOR, }; diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c index b8cd75a872ee..999cf6ee3598 100644 --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c @@ -672,17 +672,26 @@ ZFCP_DEFINE_SCSI_ATTR(zfcp_in_recovery, "%d\n", ZFCP_DEFINE_SCSI_ATTR(zfcp_status, "0x%08x\n", atomic_read(&zfcp_sdev->status)); -struct device_attribute *zfcp_sysfs_sdev_attrs[] = { - &dev_attr_fcp_lun, - &dev_attr_wwpn, - &dev_attr_hba_id, - &dev_attr_read_latency, - &dev_attr_write_latency, - &dev_attr_cmd_latency, - &dev_attr_zfcp_access_denied, - &dev_attr_zfcp_failed, - &dev_attr_zfcp_in_recovery, - &dev_attr_zfcp_status, +struct attribute *zfcp_sysfs_sdev_attrs[] = { + &dev_attr_fcp_lun.attr, + &dev_attr_wwpn.attr, + &dev_attr_hba_id.attr, + &dev_attr_read_latency.attr, + &dev_attr_write_latency.attr, + &dev_attr_cmd_latency.attr, + &dev_attr_zfcp_access_denied.attr, + &dev_attr_zfcp_failed.attr, + &dev_attr_zfcp_in_recovery.attr, + &dev_attr_zfcp_status.attr, + NULL +}; + +static const struct attribute_group zfcp_sysfs_sdev_attr_group = { + .attrs = zfcp_sysfs_sdev_attrs +}; + +const struct attribute_group *zfcp_sysfs_sdev_attr_groups[] = { + &zfcp_sysfs_sdev_attr_group, NULL }; @@ -783,12 +792,21 @@ static ssize_t zfcp_sysfs_adapter_q_full_show(struct device *dev, } static DEVICE_ATTR(queue_full, S_IRUGO, zfcp_sysfs_adapter_q_full_show, NULL); -struct device_attribute *zfcp_sysfs_shost_attrs[] = { - &dev_attr_utilization, - &dev_attr_requests, - &dev_attr_megabytes, - &dev_attr_seconds_active, - &dev_attr_queue_full, +static struct attribute *zfcp_sysfs_shost_attrs[] = { + &dev_attr_utilization.attr, + &dev_attr_requests.attr, + &dev_attr_megabytes.attr, + &dev_attr_seconds_active.attr, + &dev_attr_queue_full.attr, + NULL +}; + +static const struct attribute_group zfcp_shost_attr_group = { + .attrs = zfcp_sysfs_shost_attrs +}; + +const struct attribute_group *zfcp_shost_attr_groups[] = { + &zfcp_shost_attr_group, NULL }; From patchwork Thu Oct 7 21:18:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543457 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFABFC433FE for ; Thu, 7 Oct 2021 21:19:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA8FE61130 for ; Thu, 7 Oct 2021 21:19:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234044AbhJGVVJ (ORCPT ); Thu, 7 Oct 2021 17:21:09 -0400 Received: from mail-pg1-f169.google.com ([209.85.215.169]:47075 "EHLO mail-pg1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234057AbhJGVVH (ORCPT ); Thu, 7 Oct 2021 17:21:07 -0400 Received: by mail-pg1-f169.google.com with SMTP id m21so1009082pgu.13 for ; Thu, 07 Oct 2021 14:19:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PweJP6JFLiU7G7nl2Q6zAbDmifO27Nz8sDlEo1R/SXE=; b=bHBQPZr2NMe3vui1bk/LgQmz7wTvSqleGMkRFumvYJN+PZr+Hb02nYyY1g+ql1VfIv gBW/ebMBY+WZmVQuRz4jBJ0XL5vG0Ph5QJ9K4sOvfi9UgAMzpvZgtbziGU5UjVkngLO0 duBZF2VLNB7bKkkk8BNgBPMJ9AzVYjrrGL9tzIMFnA+ivDkQo8/iCa4e/yS7lEx0lTrJ NNXQaqv6FSrNAOgzedGmbWHtAhVEllouVWUHlkbX4CYQRoJ5651fdO2eXEkKtHiWaPJV VQTPCuBDI30/3Fh/QvvivZ0qNkoC8XIE0NH0xBdFCTlcrqHTSXvy4dhKFxUGgR3Kojd/ BCbw== X-Gm-Message-State: AOAM5338SrtmTgio9FIRGFVXlL8NYQTGutblbbzfe8zbZT04yq6kFIfb YC2p4HL0GM+OaX3Fyt6+aV4= X-Google-Smtp-Source: ABdhPJwfGyRW7F+3LvMQPYVmBy0qpCcY+dBXnMRUE/5Qg7KoWUyPPxeHUb7rXqRPIXCm+g+0ETDbvg== X-Received: by 2002:a65:6aa8:: with SMTP id x8mr1543460pgu.136.1633641553436; Thu, 07 Oct 2021 14:19:13 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:12 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Adam Radford , "James E.J. Bottomley" Subject: [PATCH v2 07/46] scsi: 3w-9xxx: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:13 -0700 Message-Id: <20211007211852.256007-8-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/3w-9xxx.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index e41cc354cc8a..785b3819588e 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c @@ -197,11 +197,20 @@ static struct device_attribute twa_host_stats_attr = { }; /* Host attributes initializer */ -static struct device_attribute *twa_host_attrs[] = { - &twa_host_stats_attr, +static struct attribute *twa_host_attrs[] = { + &twa_host_stats_attr.attr, NULL, }; +static const struct attribute_group twa_host_attr_group = { + .attrs = twa_host_attrs +}; + +static const struct attribute_group *twa_host_attr_groups[] = { + &twa_host_attr_group, + NULL +}; + /* File operations struct for character device */ static const struct file_operations twa_fops = { .owner = THIS_MODULE, @@ -1990,7 +1999,7 @@ static struct scsi_host_template driver_template = { .sg_tablesize = TW_APACHE_MAX_SGL_LENGTH, .max_sectors = TW_MAX_SECTORS, .cmd_per_lun = TW_MAX_CMDS_PER_LUN, - .shost_attrs = twa_host_attrs, + .shost_groups = twa_host_attr_groups, .emulated = 1, .no_write_same = 1, }; From patchwork Thu Oct 7 21:18:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41C20C4332F for ; Thu, 7 Oct 2021 21:19:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24AD261262 for ; Thu, 7 Oct 2021 21:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235232AbhJGVVK (ORCPT ); Thu, 7 Oct 2021 17:21:10 -0400 Received: from mail-pg1-f178.google.com ([209.85.215.178]:34566 "EHLO mail-pg1-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234200AbhJGVVJ (ORCPT ); Thu, 7 Oct 2021 17:21:09 -0400 Received: by mail-pg1-f178.google.com with SMTP id 133so1052951pgb.1 for ; Thu, 07 Oct 2021 14:19:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cdegBQ5T6pWDHp5N0JyQN/xGdWSN4ESv7t9NASXDVPQ=; b=Vtd1Q8/R+LCX5cWYMMcdFhYQBekZCOhisCM3P7TUqP4Ho1NzmXYqJQS8HOYpKLpTSi Qf0iHu4YFQRlsFhlTxkd/8TSrHmWU+9BrF+LzWRVOwIFssO1tKDzA4KQD+0rkMNPCKmm aS6t72+JJjehdr+XjXkf9F/Ub0qaTMgCwfAF2G/tEccx3Api3FPcuy3orhJT1NBnY4qi RDNFL8V+oEwe3JCwR/JpgAUBaEutcidfwPj8itphQyLEodWf3ldqcuOlz1F6AGlm+e1W 8ClHEEJzN0BfXbobqMIDK+f/O024u0D4tq5jnanevf2IcP4p6FhPJrpDRvbm/3DZT18n RinA== X-Gm-Message-State: AOAM531zPky5U5rK5f7kQ/7CKQ5BtXp7h7moMJC1HNZWpAfu87lKk45Z gKOC9DM/sGYFpcO7Q5uWbgA= X-Google-Smtp-Source: ABdhPJwJ4nxSKeTfZRcWoLqbgLZqlHcm9SAIBlUB0+AwJGwbrOQ9+mNI3DCHkKaYZilX3koxw9B74A== X-Received: by 2002:a63:f145:: with SMTP id o5mr1497503pgk.273.1633641554851; Thu, 07 Oct 2021 14:19:14 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:14 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Adam Radford , "James E.J. Bottomley" Subject: [PATCH v2 08/46] scsi: 3w-sas: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:14 -0700 Message-Id: <20211007211852.256007-9-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/3w-sas.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index 4fde39da54e4..26623a10a2f5 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -198,11 +198,20 @@ static struct device_attribute twl_host_stats_attr = { }; /* Host attributes initializer */ -static struct device_attribute *twl_host_attrs[] = { - &twl_host_stats_attr, +static struct attribute *twl_host_attrs[] = { + &twl_host_stats_attr.attr, NULL, }; +static const struct attribute_group twl_host_attr_group = { + .attrs = twl_host_attrs, +}; + +static const struct attribute_group *twl_host_attr_groups[] = { + &twl_host_attr_group, + NULL +}; + /* This function will look up an AEN severity string */ static char *twl_aen_severity_lookup(unsigned char severity_code) { @@ -1544,7 +1553,7 @@ static struct scsi_host_template driver_template = { .sg_tablesize = TW_LIBERATOR_MAX_SGL_LENGTH, .max_sectors = TW_MAX_SECTORS, .cmd_per_lun = TW_MAX_CMDS_PER_LUN, - .shost_attrs = twl_host_attrs, + .shost_groups = twl_host_attr_groups, .emulated = 1, .no_write_same = 1, }; From patchwork Thu Oct 7 21:18:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543459 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4E6DC433F5 for ; Thu, 7 Oct 2021 21:19:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D92C61077 for ; Thu, 7 Oct 2021 21:19:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234491AbhJGVVM (ORCPT ); Thu, 7 Oct 2021 17:21:12 -0400 Received: from mail-pj1-f51.google.com ([209.85.216.51]:53106 "EHLO mail-pj1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234065AbhJGVVK (ORCPT ); Thu, 7 Oct 2021 17:21:10 -0400 Received: by mail-pj1-f51.google.com with SMTP id oa4so5200708pjb.2 for ; Thu, 07 Oct 2021 14:19:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2TcWalGXcL8nJgIfJJ1nNqtxEmL5HXf/1lU9zJ13tqg=; b=V0cmHhKOzriY8kBMpk919gyn3IwO+2ONaeFVWUbQbfZWavGwck4r/SYjP/yT23KjXs HE6L0TDyS7vqbUbWp2S1KEs0Vo+CZjIEXxzIxYMoM2q62TLKAjFi+ERkQn/LJ3MT1YAt rWV9sf1xYC1slTtohmXOkVzNRRzmz0PcKKZSet9lxH/AgIixH2dKCGIXFwuaVDlrQC+O vSuwX92kczjCtrO5QzasBYGF/rrW4dESXCil8psQLRiMHtAfpZKY8b22zMUiFZd864/v HrwVIFOk6z7dQ5dUIEiL+XOFsEMOfSvqtcuzuEqmaOpTGNJJilXvqwHyiT1GGeWJTcEE eRDw== X-Gm-Message-State: AOAM530U+nyGhc1TV1EquCg0Rrdq66naLBAFQyrDQUwclGSRjajEat/4 WNCrD/N/g+VFair/7Q88NIg= X-Google-Smtp-Source: ABdhPJxMGGjMayho3gPQ5exUk3JEvPUOmItI+SNEmlC30kFW1kRUqgyVLn47GIBUnjZXPntpns4DTQ== X-Received: by 2002:a17:90b:4a45:: with SMTP id lb5mr7926159pjb.94.1633641556306; Thu, 07 Oct 2021 14:19:16 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:15 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Adam Radford , "James E.J. Bottomley" Subject: [PATCH v2 09/46] scsi: 3w-xxxx: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:15 -0700 Message-Id: <20211007211852.256007-10-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/3w-xxxx.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index 4ee485ab2714..3994df64b43b 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c @@ -532,11 +532,20 @@ static struct device_attribute tw_host_stats_attr = { }; /* Host attributes initializer */ -static struct device_attribute *tw_host_attrs[] = { - &tw_host_stats_attr, +static struct attribute *tw_host_attrs[] = { + &tw_host_stats_attr.attr, NULL, }; +static const struct attribute_group tw_host_attr_group = { + .attrs = tw_host_attrs +}; + +static const struct attribute_group *tw_host_attr_groups[] = { + &tw_host_attr_group, + NULL +}; + /* This function will read the aen queue from the isr */ static int tw_aen_read_queue(TW_Device_Extension *tw_dev, int request_id) { @@ -2242,7 +2251,7 @@ static struct scsi_host_template driver_template = { .sg_tablesize = TW_MAX_SGL_LENGTH, .max_sectors = TW_MAX_SECTORS, .cmd_per_lun = TW_MAX_CMDS_PER_LUN, - .shost_attrs = tw_host_attrs, + .shost_groups = tw_host_attr_groups, .emulated = 1, .no_write_same = 1, }; From patchwork Thu Oct 7 21:18:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A71AC433EF for ; Thu, 7 Oct 2021 21:19:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 36B91610A5 for ; Thu, 7 Oct 2021 21:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235301AbhJGVVM (ORCPT ); Thu, 7 Oct 2021 17:21:12 -0400 Received: from mail-pl1-f177.google.com ([209.85.214.177]:40590 "EHLO mail-pl1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234049AbhJGVVM (ORCPT ); Thu, 7 Oct 2021 17:21:12 -0400 Received: by mail-pl1-f177.google.com with SMTP id j15so4777316plh.7 for ; Thu, 07 Oct 2021 14:19:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PB9+oB5QIxFMeLVAlJ30VL45KwEso0vp/tcHd5OF3wI=; b=4X5ipb95/A63+ayuHUg78Nrg+1YXTL8SIDUwcOjT4UGJihD7VVrkgygSsBUwmpD48t ObIFVnH1hVrfdf88SPcbruNcOVIwu2EHTWNm6TsgPLvavolC3llzd8ad2z/pV7wfbf3P v1SgMiAbU8tZNdTfjv7AhJ7+y9/XHr1v1HMDtV0GtEBlr9lE8q5yDEJ9elJBaX4kGVg6 YXAAAhUwRnSB9zkjQdga8brQf+16vqJjWlPNdWsQX9QCin8nW83O5uh7zeg6wGXdKl62 9p6W6gY97RmYeSZyY+97mf0Cch4683qZAKgZIN8+vAHiTLh6FoutgbFnO6Z9y56LyVZd 4lfA== X-Gm-Message-State: AOAM532ANwrV2Ghja66qCBhrxZCf6Z+Rv/7xag5R68DPhmuMhQ+Meart XpKqmDJ+iiNMFTYj30HF2dQ= X-Google-Smtp-Source: ABdhPJxUUUgugO2FPACcuHz1QuT85uBduTRJrryX1WOsJWAEBbITHEj8jVJXXLx2F3BFTGA0USz8qg== X-Received: by 2002:a17:902:7fcf:b0:13e:c994:ee67 with SMTP id t15-20020a1709027fcf00b0013ec994ee67mr5847163plb.12.1633641557646; Thu, 07 Oct 2021 14:19:17 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:17 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , "James E.J. Bottomley" Subject: [PATCH v2 10/46] scsi: 53c700: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:16 -0700 Message-Id: <20211007211852.256007-11-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/53c700.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index a12e3525977d..9c2cc69dafdb 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c @@ -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 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_attr_groups[]; STATIC struct scsi_transport_template *NCR_700_transport_template = NULL; @@ -300,8 +300,8 @@ NCR_700_detect(struct scsi_host_template *tpnt, static int banner = 0; int j; - if(tpnt->sdev_attrs == NULL) - tpnt->sdev_attrs = NCR_700_dev_attrs; + if (tpnt->sdev_groups == NULL) + tpnt->sdev_groups = NCR_700_dev_attr_groups; memory = dma_alloc_coherent(dev, TOTAL_MEM_SIZE, &pScript, GFP_KERNEL); if (!memory) { @@ -2087,11 +2087,20 @@ static struct device_attribute NCR_700_active_tags_attr = { .show = NCR_700_show_active_tags, }; -STATIC struct device_attribute *NCR_700_dev_attrs[] = { - &NCR_700_active_tags_attr, +STATIC struct attribute *NCR_700_dev_attrs[] = { + &NCR_700_active_tags_attr.attr, NULL, }; +STATIC const struct attribute_group NCR_700_dev_attr_group = { + .attrs = NCR_700_dev_attrs +}; + +STATIC const struct attribute_group *NCR_700_dev_attr_groups[] = { + &NCR_700_dev_attr_group, + NULL +}; + EXPORT_SYMBOL(NCR_700_detect); EXPORT_SYMBOL(NCR_700_release); EXPORT_SYMBOL(NCR_700_intr); From patchwork Thu Oct 7 21:18:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543463 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6602BC433EF for ; Thu, 7 Oct 2021 21:19:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4DCFF61130 for ; Thu, 7 Oct 2021 21:19:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235027AbhJGVVP (ORCPT ); Thu, 7 Oct 2021 17:21:15 -0400 Received: from mail-pf1-f181.google.com ([209.85.210.181]:46938 "EHLO mail-pf1-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232200AbhJGVVN (ORCPT ); Thu, 7 Oct 2021 17:21:13 -0400 Received: by mail-pf1-f181.google.com with SMTP id u7so6376258pfg.13 for ; Thu, 07 Oct 2021 14:19:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bqJcVZCUbfW9e5QC2dYagXhWvlGFkQaQfw/2RxDVN/s=; b=0DvqV6zlmlfpyFaw+cJEOMOBdL93S1TsL7i7y+wwL/jyvbp285zcUyYqfYznUyq14f O6n9AOVgj/YRaONpAObwTETIoP6SyiC2XkmkXcayeTj5xrj/8HQvgRkh0G9CWgS+5UtU UNKmh1o9RxbyCHl9cpqd06THG4KlSYVjC7q1fyn0dqyCfElUkpSFYRBTTb0t3o9CE/rP jOGoBKkUTb//3vZmAwDscO1ly7tXGlkuCTKAzKGiaG8+HlNs6HDeYQI4uvFNu2LPJskE 0YzR7Rgd5KUrOSMH971m12iEKns6YuPCo7RyMNLNftQyQ0vb5RIhqUtbmEoG8jYRLaFc jlOQ== X-Gm-Message-State: AOAM533S8FcazmvlRBjM1WV7QO6nKacgrYuYXKQA+Cu+1AXe+Mv6QIvM s8ObZeAJLUleZA/K4/le8cs= X-Google-Smtp-Source: ABdhPJwdyzUtWJcnH+QthzJ13jijlaUhmE1koYMtltCuNQtcV9scojBDpzB8dL+/mAviUdOgTkK0MA== X-Received: by 2002:a63:1656:: with SMTP id 22mr1551825pgw.20.1633641559064; Thu, 07 Oct 2021 14:19:19 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:18 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Adaptec OEM Raid Solutions , "James E.J. Bottomley" Subject: [PATCH v2 11/46] scsi: aacraid: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:17 -0700 Message-Id: <20211007211852.256007-12-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/aacraid/linit.c | 52 ++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 3168915adaa7..f9a51389e980 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -605,12 +605,21 @@ static struct device_attribute aac_unique_id_attr = { -static struct device_attribute *aac_dev_attrs[] = { - &aac_raid_level_attr, - &aac_unique_id_attr, +static struct attribute *aac_dev_attrs[] = { + &aac_raid_level_attr.attr, + &aac_unique_id_attr.attr, NULL, }; +static const struct attribute_group aac_dev_attr_group = { + .attrs = aac_dev_attrs +}; + +static const struct attribute_group *aac_dev_attr_groups[] = { + &aac_dev_attr_group, + NULL +}; + static int aac_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user *arg) { @@ -1442,21 +1451,30 @@ static struct device_attribute aac_reset = { .show = aac_show_reset_adapter, }; -static struct device_attribute *aac_attrs[] = { - &aac_model, - &aac_vendor, - &aac_flags, - &aac_kernel_version, - &aac_monitor_version, - &aac_bios_version, - &aac_lld_version, - &aac_serial_number, - &aac_max_channel, - &aac_max_id, - &aac_reset, +static struct attribute *aac_attrs[] = { + &aac_model.attr, + &aac_vendor.attr, + &aac_flags.attr, + &aac_kernel_version.attr, + &aac_monitor_version.attr, + &aac_bios_version.attr, + &aac_lld_version.attr, + &aac_serial_number.attr, + &aac_max_channel.attr, + &aac_max_id.attr, + &aac_reset.attr, NULL }; +static const struct attribute_group aac_attr_group = { + .attrs = aac_attrs, +}; + +static const struct attribute_group *aac_attr_groups[] = { + &aac_attr_group, + NULL, +}; + ssize_t aac_get_serial_number(struct device *device, char *buf) { return aac_show_serial_number(device, &aac_serial_number, buf); @@ -1483,10 +1501,10 @@ static struct scsi_host_template aac_driver_template = { #endif .queuecommand = aac_queuecommand, .bios_param = aac_biosparm, - .shost_attrs = aac_attrs, + .shost_groups = aac_attr_groups, .slave_configure = aac_slave_configure, .change_queue_depth = aac_change_queue_depth, - .sdev_attrs = aac_dev_attrs, + .sdev_groups = aac_dev_attr_groups, .eh_abort_handler = aac_eh_abort, .eh_device_reset_handler = aac_eh_dev_reset, .eh_target_reset_handler = aac_eh_target_reset, From patchwork Thu Oct 7 21:18:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543465 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38E48C433FE for ; Thu, 7 Oct 2021 21:19:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1FA6E610A0 for ; Thu, 7 Oct 2021 21:19:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234081AbhJGVVc (ORCPT ); Thu, 7 Oct 2021 17:21:32 -0400 Received: from mail-pg1-f173.google.com ([209.85.215.173]:40590 "EHLO mail-pg1-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234049AbhJGVVb (ORCPT ); Thu, 7 Oct 2021 17:21:31 -0400 Received: by mail-pg1-f173.google.com with SMTP id h3so1033133pgb.7 for ; Thu, 07 Oct 2021 14:19:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wLZopT1ZnuY3S+aSR4gVDm/8/TwPFVJzX94oQLNWStQ=; b=Pt5RLMVZ1KVF2Cq3bfVwtkTY+JCG7UQfDcTDCyQXYaKGOmX5nBKF6yk/4WASoSTUaA i6ElsrVX72UO678IM/H7wRNMEPvLnODWyPz8n579q528vZT2VXN6xW5bCDPLweApTvio mNCeNC5ZdDRrO3/uui0Kni7rhO+NgA+9SjzLXPqNqvGNQpGh2IY4AS7eWbjRBG9+g2BT sfZQoNO8IBdkQV1n6NAbzYdvNNoI7TztlRYcPf249noq8ikI1ayB5h/7l6EKxpy7Iykg b4pFnKAy3Bzw7O5zmw2fe6uKbzdmTZe+RRiHTuvladODdKlw33zXM6Tgeey2czxJfqst zJtg== X-Gm-Message-State: AOAM533/GV908Convtgo4E8k5/gF3deZZiLg5elY5/Xe3GSTMTwbE+FH Ut9v6Agg9VhuTWfwHSk6REk= X-Google-Smtp-Source: ABdhPJyHlxOGOq9MKD6ZuG0gNeNESGN8Ib/7/YGb7ETT54HfqDXTM//sdhRG84a1di7loDZ0aZ0IBw== X-Received: by 2002:a62:7a4f:0:b0:448:6a41:14bb with SMTP id v76-20020a627a4f000000b004486a4114bbmr6594508pfc.31.1633641576675; Thu, 07 Oct 2021 14:19:36 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:36 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , "James E.J. Bottomley" , ching Huang , Vaibhav Gupta , Hannes Reinecke , Kees Cook Subject: [PATCH v2 12/46] scsi: arcmsr: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:18 -0700 Message-Id: <20211007211852.256007-13-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/arcmsr/arcmsr.h | 2 +- drivers/scsi/arcmsr/arcmsr_attr.c | 33 +++++++++++++++++++------------ drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h index 6ce57f031df5..2b63145ed702 100644 --- a/drivers/scsi/arcmsr/arcmsr.h +++ b/drivers/scsi/arcmsr/arcmsr.h @@ -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_attr_groups[]; extern int arcmsr_alloc_sysfs_attr(struct AdapterControlBlock *); void arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb); diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c index 57be9609d504..ef448549263c 100644 --- a/drivers/scsi/arcmsr/arcmsr_attr.c +++ b/drivers/scsi/arcmsr/arcmsr_attr.c @@ -58,8 +58,6 @@ #include #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_attr_groups[] = { + &arcmsr_host_attr_group, + NULL +}; diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index ec1a834c922d..2c794f4c7ea7 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c @@ -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_attr_groups, .no_write_same = 1, }; From patchwork Thu Oct 7 21:18:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543467 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2287C433F5 for ; Thu, 7 Oct 2021 21:19:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC89D61130 for ; Thu, 7 Oct 2021 21:19:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234049AbhJGVVd (ORCPT ); Thu, 7 Oct 2021 17:21:33 -0400 Received: from mail-pf1-f182.google.com ([209.85.210.182]:46966 "EHLO mail-pf1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232200AbhJGVVc (ORCPT ); Thu, 7 Oct 2021 17:21:32 -0400 Received: by mail-pf1-f182.google.com with SMTP id u7so6376956pfg.13 for ; Thu, 07 Oct 2021 14:19:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1txEUM4H4idv3DopyS9GPuuUIeCZSz9pvwjh9863dW4=; b=ey6HwYDRIYv7kmvOSGJ38OLFnzIT2QMLiAgISMpvhXwG5FMuuy4q0cr2ybgdIddGKr LY9PtA7O4tPBhQyokG6mT2hfVsxvxFSpzq7TsSSjQ3CqJQ1Huw6BrsbB4J26o0GERF2P 7TSD8Pn7RAOgqMOVRYlh+zp79zuTWhF1UAWuO0ald56PnLyCJhgSbBQ4ANH8t6rKLoaY p7kjuR3OMxzLfdln+Hv1ryEBk2pyX3odSvoL1bXPx9XwUqnjjsU+2XKq+OeAOhVcuTsG nEY2PEfwLRJhZcSs7Ki8Dnh+ZKAcCG4z/uzCmwpaQPwgxXB7dWM2WcM94wq+VsYWB/xP cZWQ== X-Gm-Message-State: AOAM530HfpxC+2diVR3J/Aj84pRe+DLESmwMeZxLNjXEpoR7QboIWB5D qoyTQ1KGKfrG2ZIDh/3MQsg= X-Google-Smtp-Source: ABdhPJzT/8idpKDgTmsnMMap6B8r1s5ZEFKYd7/GTladnl5qfLLupRMjbC6MkASYf9IuSddAP6WIcA== X-Received: by 2002:aa7:9d0b:0:b0:44c:62a6:8679 with SMTP id k11-20020aa79d0b000000b0044c62a68679mr6732041pfp.0.1633641578084; Thu, 07 Oct 2021 14:19:38 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:37 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Ketan Mukadam , "James E.J. Bottomley" Subject: [PATCH v2 13/46] scsi: be2iscsi: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:19 -0700 Message-Id: <20211007211852.256007-14-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/be2iscsi/be_main.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index e70f69f791db..725aa0b30106 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -163,14 +163,24 @@ DEVICE_ATTR(beiscsi_active_session_count, S_IRUGO, beiscsi_active_session_disp, NULL); DEVICE_ATTR(beiscsi_free_session_count, S_IRUGO, beiscsi_free_session_disp, NULL); -static struct device_attribute *beiscsi_attrs[] = { - &dev_attr_beiscsi_log_enable, - &dev_attr_beiscsi_drvr_ver, - &dev_attr_beiscsi_adapter_family, - &dev_attr_beiscsi_fw_ver, - &dev_attr_beiscsi_active_session_count, - &dev_attr_beiscsi_free_session_count, - &dev_attr_beiscsi_phys_port, + +static struct attribute *beiscsi_attrs[] = { + &dev_attr_beiscsi_log_enable.attr, + &dev_attr_beiscsi_drvr_ver.attr, + &dev_attr_beiscsi_adapter_family.attr, + &dev_attr_beiscsi_fw_ver.attr, + &dev_attr_beiscsi_active_session_count.attr, + &dev_attr_beiscsi_free_session_count.attr, + &dev_attr_beiscsi_phys_port.attr, + NULL, +}; + +static const struct attribute_group beiscsi_attr_group = { + .attrs = beiscsi_attrs, +}; + +static const struct attribute_group *beiscsi_attr_groups[] = { + &beiscsi_attr_group, NULL, }; @@ -391,7 +401,7 @@ static struct scsi_host_template beiscsi_sht = { .eh_abort_handler = beiscsi_eh_abort, .eh_device_reset_handler = beiscsi_eh_device_reset, .eh_target_reset_handler = iscsi_eh_session_reset, - .shost_attrs = beiscsi_attrs, + .shost_groups = beiscsi_attr_groups, .sg_tablesize = BEISCSI_SGLIST_ELEMENTS, .can_queue = BE2_IO_DEPTH, .this_id = -1, From patchwork Thu Oct 7 21:18:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543469 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28FCAC433EF for ; Thu, 7 Oct 2021 21:19:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1379761077 for ; Thu, 7 Oct 2021 21:19:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234388AbhJGVVe (ORCPT ); Thu, 7 Oct 2021 17:21:34 -0400 Received: from mail-pl1-f182.google.com ([209.85.214.182]:46038 "EHLO mail-pl1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234337AbhJGVVe (ORCPT ); Thu, 7 Oct 2021 17:21:34 -0400 Received: by mail-pl1-f182.google.com with SMTP id n2so4723554plk.12 for ; Thu, 07 Oct 2021 14:19:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tNJN4AwYQAGimEQYMNQksn/1wzeQxmaJ1jxmWraz950=; b=toDR1wuTAWt3HBeSTfWseEKAWiNBUt/MFUiPPJ/49yg+7EEJuyCkANMSRiUBBz1iYl yzRBxrOo7RzZf4YlFDMUeBFlSV9aJH7WduQDfSZR1UljHanRiQPj/9h7jCZOEdAn9QvB MBhBevWGubauL5JRuVwgbUzovhxkbl4CB2NEL1bff9E8rYHXLM9De3HWIAdPa6QONUIw YVXzXr1dbj7YA7bM1xlG742gOt8qw3Sk1a1W0DQ/+ZOePKYM158DEnsd+4KJH094Mc44 aX8rtxa020aoufzBdKdCun+rChpWVtWAg4Jt/HCdw38lKM2NvEDuNNqKy97PGu0lko2f S9ng== X-Gm-Message-State: AOAM530ITedMU+nrx0UOIrbjg9tre93sMCn74dXOliNVsXjANkh9tlAd 55qyPfqkXHqHmae5lSc66VgVAg3Wg6aewg== X-Google-Smtp-Source: ABdhPJySDLw8WpZAREY/WGzfeV9XaSuZYwL+NQFME/xU1PbWh+95udHl0mCdkR5GaZntxItlvgv2ww== X-Received: by 2002:a17:90b:17d0:: with SMTP id me16mr8118578pjb.152.1633641579735; Thu, 07 Oct 2021 14:19:39 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:39 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Anil Gurumurthy , Sudarsana Kalluru , "James E.J. Bottomley" Subject: [PATCH v2 14/46] scsi: bfa: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:20 -0700 Message-Id: <20211007211852.256007-15-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/bfa/bfad_attr.c | 68 ++++++++++++++++++++++-------------- drivers/scsi/bfa/bfad_im.c | 4 +-- drivers/scsi/bfa/bfad_im.h | 4 +-- 3 files changed, 46 insertions(+), 30 deletions(-) diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c index 5ae1e3f78910..0f9e766b62e4 100644 --- a/drivers/scsi/bfa/bfad_attr.c +++ b/drivers/scsi/bfa/bfad_attr.c @@ -956,36 +956,52 @@ static DEVICE_ATTR(driver_name, S_IRUGO, bfad_im_drv_name_show, NULL); static DEVICE_ATTR(number_of_discovered_ports, S_IRUGO, bfad_im_num_of_discovered_ports_show, NULL); -struct device_attribute *bfad_im_host_attrs[] = { - &dev_attr_serial_number, - &dev_attr_model, - &dev_attr_model_description, - &dev_attr_node_name, - &dev_attr_symbolic_name, - &dev_attr_hardware_version, - &dev_attr_driver_version, - &dev_attr_option_rom_version, - &dev_attr_firmware_version, - &dev_attr_number_of_ports, - &dev_attr_driver_name, - &dev_attr_number_of_discovered_ports, +static struct attribute *bfad_im_host_attrs[] = { + &dev_attr_serial_number.attr, + &dev_attr_model.attr, + &dev_attr_model_description.attr, + &dev_attr_node_name.attr, + &dev_attr_symbolic_name.attr, + &dev_attr_hardware_version.attr, + &dev_attr_driver_version.attr, + &dev_attr_option_rom_version.attr, + &dev_attr_firmware_version.attr, + &dev_attr_number_of_ports.attr, + &dev_attr_driver_name.attr, + &dev_attr_number_of_discovered_ports.attr, NULL, }; -struct device_attribute *bfad_im_vport_attrs[] = { - &dev_attr_serial_number, - &dev_attr_model, - &dev_attr_model_description, - &dev_attr_node_name, - &dev_attr_symbolic_name, - &dev_attr_hardware_version, - &dev_attr_driver_version, - &dev_attr_option_rom_version, - &dev_attr_firmware_version, - &dev_attr_number_of_ports, - &dev_attr_driver_name, - &dev_attr_number_of_discovered_ports, +static const struct attribute_group bfad_im_host_attr_group = { + .attrs = bfad_im_host_attrs +}; + +const struct attribute_group *bfad_im_host_attr_groups[] = { + &bfad_im_host_attr_group, + NULL +}; + +struct attribute *bfad_im_vport_attrs[] = { + &dev_attr_serial_number.attr, + &dev_attr_model.attr, + &dev_attr_model_description.attr, + &dev_attr_node_name.attr, + &dev_attr_symbolic_name.attr, + &dev_attr_hardware_version.attr, + &dev_attr_driver_version.attr, + &dev_attr_option_rom_version.attr, + &dev_attr_firmware_version.attr, + &dev_attr_number_of_ports.attr, + &dev_attr_driver_name.attr, + &dev_attr_number_of_discovered_ports.attr, NULL, }; +static const struct attribute_group bfad_im_vport_attr_group = { + .attrs = bfad_im_vport_attrs +}; +const struct attribute_group *bfad_im_vport_attr_groups[] = { + &bfad_im_vport_attr_group, + NULL +}; diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c index 6b5841b1c06e..1eeb7d0b988f 100644 --- a/drivers/scsi/bfa/bfad_im.c +++ b/drivers/scsi/bfa/bfad_im.c @@ -809,7 +809,7 @@ struct scsi_host_template bfad_im_scsi_host_template = { .this_id = -1, .sg_tablesize = BFAD_IO_MAX_SGE, .cmd_per_lun = 3, - .shost_attrs = bfad_im_host_attrs, + .shost_groups = bfad_im_host_attr_groups, .max_sectors = BFAD_MAX_SECTORS, .vendor_id = BFA_PCI_VENDOR_ID_BROCADE, }; @@ -831,7 +831,7 @@ struct scsi_host_template bfad_im_vport_template = { .this_id = -1, .sg_tablesize = BFAD_IO_MAX_SGE, .cmd_per_lun = 3, - .shost_attrs = bfad_im_vport_attrs, + .shost_groups = bfad_im_vport_attr_groups, .max_sectors = BFAD_MAX_SECTORS, }; diff --git a/drivers/scsi/bfa/bfad_im.h b/drivers/scsi/bfa/bfad_im.h index f16d4b219e44..87c67259c38c 100644 --- a/drivers/scsi/bfa/bfad_im.h +++ b/drivers/scsi/bfa/bfad_im.h @@ -174,8 +174,8 @@ extern struct fc_function_template bfad_im_vport_fc_function_template; extern struct scsi_transport_template *bfad_im_scsi_transport_template; extern struct scsi_transport_template *bfad_im_scsi_vport_transport_template; -extern struct device_attribute *bfad_im_host_attrs[]; -extern struct device_attribute *bfad_im_vport_attrs[]; +extern const struct attribute_group *bfad_im_host_attr_groups[]; +extern const struct attribute_group *bfad_im_vport_attr_groups[]; irqreturn_t bfad_intx(int irq, void *dev_id); From patchwork Thu Oct 7 21:18:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543471 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 594E5C433EF for ; Thu, 7 Oct 2021 21:19:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42A6F610A0 for ; Thu, 7 Oct 2021 21:19:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235027AbhJGVVg (ORCPT ); Thu, 7 Oct 2021 17:21:36 -0400 Received: from mail-pg1-f179.google.com ([209.85.215.179]:36736 "EHLO mail-pg1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234337AbhJGVVf (ORCPT ); Thu, 7 Oct 2021 17:21:35 -0400 Received: by mail-pg1-f179.google.com with SMTP id 75so1046558pga.3 for ; Thu, 07 Oct 2021 14:19:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FrysTrRWqfpxxlxiOt57RERG55tTS7+lfWY0NmIIYqA=; b=rYAbopXr5dXAFQpkGYoDRPAzt60drEQfjV45hi/xM6yJk8IJr2Uk8tux3nvGry9Rnj 0VUXavoUMBJl4QdLrAUKxcUyQtsqYGSrp1md33D7ncRQuVJvAMVPsJIAzCDWXJFhDJ4Y z+pjAL1mqL29xTyfCvG3wKGNnXqh/97aM+Ld4HmHDzKd48dRDaxOpfd9/ha3ngyHlATn uaAzNyhFDGw9ZMwXYKQxc1EimneQUHRpVd9l+rJG/L+w3zHBNT3OmetWvU5XrxyHZK4p /Gc9JzNELDNgC+T0hPSGNCy7DEREuunrm4/UTL09i9agc3IOTKlMjcpKEOg802b4fcBs Ln3g== X-Gm-Message-State: AOAM531sVe1T12leMFCHoYHHluvBV8ceYOl4UPl7YHpG0Ji6046YCjLR TS43xdJETdp9EtdG8xur1XwbR6lC4lEaoQ== X-Google-Smtp-Source: ABdhPJxBGAGHVm8xYNgfRtfGqde+NFWQJxBEGp2YfMoqNZmGmxqLlPp0vols+hCtACRgKNCwr906mw== X-Received: by 2002:a05:6a00:1255:b0:44c:dd49:b39a with SMTP id u21-20020a056a00125500b0044cdd49b39amr96262pfi.66.1633641581245; Thu, 07 Oct 2021 14:19:41 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:40 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Saurav Kashyap , Javed Hasan , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" Subject: [PATCH v2 15/46] scsi: bnx2fc: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:21 -0700 Message-Id: <20211007211852.256007-16-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index 8863a74e6c57..adf8864bde9c 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c @@ -2951,11 +2951,20 @@ bnx2fc_tm_timeout_store(struct device *dev, static DEVICE_ATTR(tm_timeout, S_IRUGO|S_IWUSR, bnx2fc_tm_timeout_show, bnx2fc_tm_timeout_store); -static struct device_attribute *bnx2fc_host_attrs[] = { - &dev_attr_tm_timeout, +static struct attribute *bnx2fc_host_attrs[] = { + &dev_attr_tm_timeout.attr, NULL, }; +static const struct attribute_group bnx2fc_host_attr_group = { + .attrs = bnx2fc_host_attrs +}; + +static const struct attribute_group *bnx2fc_host_attr_groups[] = { + &bnx2fc_host_attr_group, + NULL +}; + /* * scsi_host_template structure used while registering with SCSI-ml */ @@ -2977,7 +2986,7 @@ static struct scsi_host_template bnx2fc_shost_template = { .max_sectors = 0x3fbf, .track_queue_depth = 1, .slave_configure = bnx2fc_slave_configure, - .shost_attrs = bnx2fc_host_attrs, + .shost_groups = bnx2fc_host_attr_groups, }; static struct libfc_function_template bnx2fc_libfc_fcn_templ = { From patchwork Thu Oct 7 21:18:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543473 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63CDDC433F5 for ; Thu, 7 Oct 2021 21:19:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4ECF461077 for ; Thu, 7 Oct 2021 21:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234337AbhJGVVj (ORCPT ); Thu, 7 Oct 2021 17:21:39 -0400 Received: from mail-pf1-f176.google.com ([209.85.210.176]:34754 "EHLO mail-pf1-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235301AbhJGVVh (ORCPT ); Thu, 7 Oct 2021 17:21:37 -0400 Received: by mail-pf1-f176.google.com with SMTP id g14so6428725pfm.1 for ; Thu, 07 Oct 2021 14:19:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S+3Uwj2D4q3hy8MOz5KjrEDG2Gq3Osya5s/ucEvkU7o=; b=zAlAcAqT2zuTbm/NP7c0whVNSkrcuJQaslkUWBkNMZrrRRmpDBpyI5Il+NQtAiWxFe Rt+HBodkemNgu4FPjH/QDrRURgvdFmbyTggAC+25IQgI0zc/W0pwiuc+K1AI6nT+D5O+ qk5hg2wm3x8HKynOgY5I7TM83ZbLFqBdoaqiXpQ7zoTpx8G6nzxsik8ksxdDjQbbPK5N HmOvJLnmwt1uQnnodgHGAgB5MIv5Ff7M9QnZj2NH/ZfgxVqvuxPDRGfpw1z7sOM7wqGq RwQcN46mbCkNKaTxHx32mmXlsn2CsEHpsiHKp8HwBHjG0OFsnNIfARWYAramB+X0W6Lr qHwA== X-Gm-Message-State: AOAM532m4oUf5LHHUDkDbNiXHDPxF3XXhza/45HWkGhAHVU/VbwSOmVC 18OH1jxU8390YFJef3LWX90= X-Google-Smtp-Source: ABdhPJzZ2iJtRCQv5yA+eJaiM3YcMT3+mTMn8Ycv1XSDGg1BYtSNYN3ViQAVuMo2M7JwV9cbSk+3iQ== X-Received: by 2002:a62:6203:0:b0:44c:7649:90b0 with SMTP id w3-20020a626203000000b0044c764990b0mr6740546pfb.21.1633641582908; Thu, 07 Oct 2021 14:19:42 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:42 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Nilesh Javali , Manish Rangankar , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" Subject: [PATCH v2 16/46] scsi: bnx2i: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:22 -0700 Message-Id: <20211007211852.256007-17-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/bnx2i/bnx2i.h | 2 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- drivers/scsi/bnx2i/bnx2i_sysfs.c | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h index 663a63d4dae4..e9cf53559408 100644 --- a/drivers/scsi/bnx2i/bnx2i.h +++ b/drivers/scsi/bnx2i/bnx2i.h @@ -795,7 +795,7 @@ extern struct cnic_ulp_ops bnx2i_cnic_cb; extern unsigned int sq_size; extern unsigned int rq_size; -extern struct device_attribute *bnx2i_dev_attributes[]; +extern const struct attribute_group *bnx2i_dev_attr_groups[]; diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c index 1b5f3e143f07..4d034affbf09 100644 --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c @@ -2266,7 +2266,7 @@ static struct scsi_host_template bnx2i_host_template = { .cmd_per_lun = 128, .this_id = -1, .sg_tablesize = ISCSI_MAX_BDS_PER_CMD, - .shost_attrs = bnx2i_dev_attributes, + .shost_groups = bnx2i_dev_attr_groups, .track_queue_depth = 1, }; diff --git a/drivers/scsi/bnx2i/bnx2i_sysfs.c b/drivers/scsi/bnx2i/bnx2i_sysfs.c index bea00073cb7c..7aa5440aa13c 100644 --- a/drivers/scsi/bnx2i/bnx2i_sysfs.c +++ b/drivers/scsi/bnx2i/bnx2i_sysfs.c @@ -142,8 +142,17 @@ static DEVICE_ATTR(sq_size, S_IRUGO | S_IWUSR, static DEVICE_ATTR(num_ccell, S_IRUGO | S_IWUSR, bnx2i_show_ccell_info, bnx2i_set_ccell_info); -struct device_attribute *bnx2i_dev_attributes[] = { - &dev_attr_sq_size, - &dev_attr_num_ccell, +static struct attribute *bnx2i_dev_attributes[] = { + &dev_attr_sq_size.attr, + &dev_attr_num_ccell.attr, + NULL +}; + +static const struct attribute_group bnx2i_dev_attr_group = { + .attrs = bnx2i_dev_attributes +}; + +const struct attribute_group *bnx2i_dev_attr_groups[] = { + &bnx2i_dev_attr_group, NULL }; From patchwork Thu Oct 7 21:18:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0000C433F5 for ; Thu, 7 Oct 2021 21:19:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD29F610A0 for ; Thu, 7 Oct 2021 21:19:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234388AbhJGVVo (ORCPT ); Thu, 7 Oct 2021 17:21:44 -0400 Received: from mail-pl1-f172.google.com ([209.85.214.172]:46659 "EHLO mail-pl1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234049AbhJGVVn (ORCPT ); Thu, 7 Oct 2021 17:21:43 -0400 Received: by mail-pl1-f172.google.com with SMTP id w11so4720281plz.13 for ; Thu, 07 Oct 2021 14:19:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cW65z7/LTV3aCyXTScAx5pfPvVu6c26bkf/AFoIwOY0=; b=S8uRRTQKv+5ajS20o9mz+wTFYe7sAqZkj28whtvcbXdjH+X+45F/HgbJ9QlXCcW0Ib KM7ou0I48L0jIU15CWuFvX/lQfRVtxFAe9UHPk/+P7GqWvpkOwKAiYl0w/OuMHpv+3QD 3nS3WDJ5veoSh/8HOwxiJmQLOwO/gYH//VplYMDlf5YEYIviKbQ7M3T8ZEqzog7NDIJj mLwXFkBpMgaZFtLMZs3Dv3VRCGRk1lFXwwaEClTuQUSGtJdYE6zeX3/OxadVwumNnvj+ NvE6pKISq1FuWX/r3a1iiQyleZCFU0Ht38tXlRG4tYF72Jn/qXjmWmDQS2CkihFH1iLJ ew0A== X-Gm-Message-State: AOAM532yYPhsbAUQKmY4HpRUCdisn9kQmKQ2mChMebHNnNXwNJXAH8iL jXI/3idSPxIIASdtgi+Z+vU= X-Google-Smtp-Source: ABdhPJzVeu3KpNUuzJtq8SJqMh2m8Grbb32UNLFCuvSm29/0qn8hGkZn76gJ8VR0YjiFDXriiAeMnA== X-Received: by 2002:a17:90b:3382:: with SMTP id ke2mr7876803pjb.153.1633641589581; Thu, 07 Oct 2021 14:19:49 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:49 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , "James E.J. Bottomley" , Jiapeng Chong Subject: [PATCH v2 17/46] scsi: csiostor: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:23 -0700 Message-Id: <20211007211852.256007-18-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/csiostor/csio_scsi.c | 38 +++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c index 3b2eb6ce1fcf..b7ef0a6cae22 100644 --- a/drivers/scsi/csiostor/csio_scsi.c +++ b/drivers/scsi/csiostor/csio_scsi.c @@ -1460,14 +1460,23 @@ static DEVICE_ATTR(disable_port, S_IWUSR, NULL, csio_disable_port); static DEVICE_ATTR(dbg_level, S_IRUGO | S_IWUSR, csio_show_dbg_level, csio_store_dbg_level); -static struct device_attribute *csio_fcoe_lport_attrs[] = { - &dev_attr_hw_state, - &dev_attr_device_reset, - &dev_attr_disable_port, - &dev_attr_dbg_level, +static struct attribute *csio_fcoe_lport_attrs[] = { + &dev_attr_hw_state.attr, + &dev_attr_device_reset.attr, + &dev_attr_disable_port.attr, + &dev_attr_dbg_level.attr, NULL, }; +static const struct attribute_group csio_fcoe_lport_attr_group = { + .attrs = csio_fcoe_lport_attrs +}; + +static const struct attribute_group *csio_fcoe_lport_attr_groups[] = { + &csio_fcoe_lport_attr_group, + NULL +}; + static ssize_t csio_show_num_reg_rnodes(struct device *dev, struct device_attribute *attr, char *buf) @@ -1479,12 +1488,21 @@ csio_show_num_reg_rnodes(struct device *dev, static DEVICE_ATTR(num_reg_rnodes, S_IRUGO, csio_show_num_reg_rnodes, NULL); -static struct device_attribute *csio_fcoe_vport_attrs[] = { - &dev_attr_num_reg_rnodes, - &dev_attr_dbg_level, +static struct attribute *csio_fcoe_vport_attrs[] = { + &dev_attr_num_reg_rnodes.attr, + &dev_attr_dbg_level.attr, NULL, }; +static const struct attribute_group csio_fcoe_vport_attr_group = { + .attrs = csio_fcoe_vport_attrs +}; + +static const struct attribute_group *csio_fcoe_vport_attr_groups[] = { + &csio_fcoe_vport_attr_group, + NULL +}; + static inline uint32_t csio_scsi_copy_to_sgl(struct csio_hw *hw, struct csio_ioreq *req) { @@ -2277,7 +2295,7 @@ struct scsi_host_template csio_fcoe_shost_template = { .this_id = -1, .sg_tablesize = CSIO_SCSI_MAX_SGE, .cmd_per_lun = CSIO_MAX_CMD_PER_LUN, - .shost_attrs = csio_fcoe_lport_attrs, + .shost_groups = csio_fcoe_lport_attr_groups, .max_sectors = CSIO_MAX_SECTOR_SIZE, }; @@ -2296,7 +2314,7 @@ struct scsi_host_template csio_fcoe_shost_vport_template = { .this_id = -1, .sg_tablesize = CSIO_SCSI_MAX_SGE, .cmd_per_lun = CSIO_MAX_CMD_PER_LUN, - .shost_attrs = csio_fcoe_vport_attrs, + .shost_groups = csio_fcoe_vport_attr_groups, .max_sectors = CSIO_MAX_SECTOR_SIZE, }; From patchwork Thu Oct 7 21:18:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C088C433FE for ; Thu, 7 Oct 2021 21:19:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 738A7610A5 for ; Thu, 7 Oct 2021 21:19:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235301AbhJGVVq (ORCPT ); Thu, 7 Oct 2021 17:21:46 -0400 Received: from mail-pj1-f54.google.com ([209.85.216.54]:38695 "EHLO mail-pj1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235232AbhJGVVp (ORCPT ); Thu, 7 Oct 2021 17:21:45 -0400 Received: by mail-pj1-f54.google.com with SMTP id g13-20020a17090a3c8d00b00196286963b9so7902725pjc.3 for ; Thu, 07 Oct 2021 14:19:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ILCdfMjMlEywtFO+swooiCogyq33/AUvhdi2qGcJ4G8=; b=yZFOcTtuViA4hRB8ghoLHW4KdYQS3JbwhwlzYzLEoqtkXu3WAcUkSnGNS1PsN3zWnM f/avVy0TMHlwz0D0LYr1pQ2h27U+4ZYsjal4QbQJh++Zf9LgBWjefLZPhXyKKr6q3Ty8 X/AB1sg0axhnY7jEgd4GE9EEPYJ8kjWd9GCg0UqgPrR7dvkK6ID2s4FoN9RR4DxHjH7p Gb4B5mUAPFxIQ5PR41f7tA81Lo+Y3aTXRk+084RcA+JE1cc8HdSaHC1qNspOeUOWiSXz Mehyi7JXUXoiBfVSQajaiEi8MHFdFdj+2uPdOdUlaajPHUZJNBFuRBQ02F7jgKg3csVs 8q2Q== X-Gm-Message-State: AOAM530PIoSKYSURQCAkbzuck3xKXJ8s8DDoAlX9gq+G4TQ5qnVV95ns 4ObQnurdtgCwIBIBvoyADhI= X-Google-Smtp-Source: ABdhPJz+Dw201n1JPJiutp4x3z4r2iBax1erYjOIGVo1QkO4zmHtM6tAyxUy/5lRocphAuV+B+oD+A== X-Received: by 2002:a17:90a:3fc4:: with SMTP id u4mr7908098pjm.127.1633641591072; Thu, 07 Oct 2021 14:19:51 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:50 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , "Matthew R. Ochs" , Uma Krishnan , "James E.J. Bottomley" Subject: [PATCH v2 18/46] scsi: cxlflash: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:24 -0700 Message-Id: <20211007211852.256007-19-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/cxlflash/main.c | 54 ++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c index b2730e859df8..c11ed8f1fc71 100644 --- a/drivers/scsi/cxlflash/main.c +++ b/drivers/scsi/cxlflash/main.c @@ -3103,20 +3103,29 @@ static DEVICE_ATTR_RW(irqpoll_weight); static DEVICE_ATTR_RW(num_hwqs); static DEVICE_ATTR_RW(hwq_mode); -static struct device_attribute *cxlflash_host_attrs[] = { - &dev_attr_port0, - &dev_attr_port1, - &dev_attr_port2, - &dev_attr_port3, - &dev_attr_lun_mode, - &dev_attr_ioctl_version, - &dev_attr_port0_lun_table, - &dev_attr_port1_lun_table, - &dev_attr_port2_lun_table, - &dev_attr_port3_lun_table, - &dev_attr_irqpoll_weight, - &dev_attr_num_hwqs, - &dev_attr_hwq_mode, +static struct attribute *cxlflash_host_attrs[] = { + &dev_attr_port0.attr, + &dev_attr_port1.attr, + &dev_attr_port2.attr, + &dev_attr_port3.attr, + &dev_attr_lun_mode.attr, + &dev_attr_ioctl_version.attr, + &dev_attr_port0_lun_table.attr, + &dev_attr_port1_lun_table.attr, + &dev_attr_port2_lun_table.attr, + &dev_attr_port3_lun_table.attr, + &dev_attr_irqpoll_weight.attr, + &dev_attr_num_hwqs.attr, + &dev_attr_hwq_mode.attr, + NULL +}; + +static const struct attribute_group cxlflash_host_attr_group = { + .attrs = cxlflash_host_attrs +}; + +static const struct attribute_group *cxlflash_host_attr_groups[] = { + &cxlflash_host_attr_group, NULL }; @@ -3125,8 +3134,17 @@ static struct device_attribute *cxlflash_host_attrs[] = { */ static DEVICE_ATTR_RO(mode); -static struct device_attribute *cxlflash_dev_attrs[] = { - &dev_attr_mode, +static struct attribute *cxlflash_dev_attrs[] = { + &dev_attr_mode.attr, + NULL +}; + +static const struct attribute_group cxlflash_dev_attr_group = { + .attrs = cxlflash_dev_attrs +}; + +static const struct attribute_group *cxlflash_dev_attr_groups[] = { + &cxlflash_dev_attr_group, NULL }; @@ -3150,8 +3168,8 @@ static struct scsi_host_template driver_template = { .this_id = -1, .sg_tablesize = 1, /* No scatter gather support */ .max_sectors = CXLFLASH_MAX_SECTORS, - .shost_attrs = cxlflash_host_attrs, - .sdev_attrs = cxlflash_dev_attrs, + .shost_groups = cxlflash_host_attr_groups, + .sdev_groups = cxlflash_dev_attr_groups, }; /* From patchwork Thu Oct 7 21:18:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FBF8C433EF for ; Thu, 7 Oct 2021 21:19:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 81198610A0 for ; Thu, 7 Oct 2021 21:19:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238287AbhJGVVs (ORCPT ); Thu, 7 Oct 2021 17:21:48 -0400 Received: from mail-pl1-f177.google.com ([209.85.214.177]:36787 "EHLO mail-pl1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235027AbhJGVVr (ORCPT ); Thu, 7 Oct 2021 17:21:47 -0400 Received: by mail-pl1-f177.google.com with SMTP id y5so4786261pll.3 for ; Thu, 07 Oct 2021 14:19:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5qV7psAg7CTtX/SZ4vw1EGgW2BEbq+WxYdQAxMFF7QA=; b=bGVpZQDlmuEinVp1hLmpkMaYlRIePtkJ33qwoY/9kf8ZAFnxWh3XOnKyEunHgXR2zj Fmoo8KIRJrjZyL8VZbBtjoElNe5zQP6+skLRhduom3w3Q+vYhZMzzVtSKgg5la3dvogl zQxC31s6dLxTX5cOruFTYp8rd6nUawxAg9eBozSg92VkwJV1/RTSIeyr1/iFovYORYg+ 8oTzoBupJe/gNNYiTSvY5XDYKzKSCdOr6kg3jEnnw7XDyXa1pxylW2brR3o94WAdS6mj MtiIRC4pttGtQWJnx5YXDbzMXN68sOBBM8Aj+BtNJl76vqYElG+fZAWN2TmCdN+MVGw/ tD6w== X-Gm-Message-State: AOAM53393V2sjNjKU8ev8pvdBdlkGkHKlVPkbUw55Edet1GslQss+vBN A2BYRwhf0+I4P1swOp/X/+g= X-Google-Smtp-Source: ABdhPJx2O+0csuZWcvVzkGOE+0DVRO6Q//wOCuhAGtLhlPSff6r15/kbniveMqUAviDLGwBjja0djQ== X-Received: by 2002:a17:90a:9289:: with SMTP id n9mr7980324pjo.27.1633641592721; Thu, 07 Oct 2021 14:19:52 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:52 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Satish Kharat , Sesidhar Baddela , Karan Tilak Kumar , "James E.J. Bottomley" Subject: [PATCH v2 19/46] scsi: fnic: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:25 -0700 Message-Id: <20211007211852.256007-20-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_attrs.c | 17 +++++++++++++---- drivers/scsi/fnic/fnic_main.c | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 69f373b53132..d617c1d3dcf0 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -322,7 +322,7 @@ static inline struct fnic *fnic_from_ctlr(struct fcoe_ctlr *fip) extern struct workqueue_struct *fnic_event_queue; extern struct workqueue_struct *fnic_fip_queue; -extern struct device_attribute *fnic_attrs[]; +extern const struct attribute_group *fnic_attr_groups[]; void fnic_clear_intr_mode(struct fnic *fnic); int fnic_set_intr_mode(struct fnic *fnic); diff --git a/drivers/scsi/fnic/fnic_attrs.c b/drivers/scsi/fnic/fnic_attrs.c index aea0c3becfd4..afc4566629c6 100644 --- a/drivers/scsi/fnic/fnic_attrs.c +++ b/drivers/scsi/fnic/fnic_attrs.c @@ -48,9 +48,18 @@ static DEVICE_ATTR(fnic_state, S_IRUGO, fnic_show_state, NULL); static DEVICE_ATTR(drv_version, S_IRUGO, fnic_show_drv_version, NULL); static DEVICE_ATTR(link_state, S_IRUGO, fnic_show_link_state, NULL); -struct device_attribute *fnic_attrs[] = { - &dev_attr_fnic_state, - &dev_attr_drv_version, - &dev_attr_link_state, +static struct attribute *fnic_attrs[] = { + &dev_attr_fnic_state.attr, + &dev_attr_drv_version.attr, + &dev_attr_link_state.attr, NULL, }; + +static const struct attribute_group fnic_attr_group = { + .attrs = fnic_attrs +}; + +const struct attribute_group *fnic_attr_groups[] = { + &fnic_attr_group, + NULL +}; diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index 786f9d2704b6..5ce44eacaf20 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c @@ -122,7 +122,7 @@ static struct scsi_host_template fnic_host_template = { .can_queue = FNIC_DFLT_IO_REQ, .sg_tablesize = FNIC_MAX_SG_DESC_CNT, .max_sectors = 0xffff, - .shost_attrs = fnic_attrs, + .shost_groups = fnic_attr_groups, .track_queue_depth = 1, }; From patchwork Thu Oct 7 21:18:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543481 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5508C433EF for ; Thu, 7 Oct 2021 21:19:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0025610A5 for ; Thu, 7 Oct 2021 21:19:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240366AbhJGVVv (ORCPT ); Thu, 7 Oct 2021 17:21:51 -0400 Received: from mail-pg1-f182.google.com ([209.85.215.182]:46640 "EHLO mail-pg1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239126AbhJGVVs (ORCPT ); Thu, 7 Oct 2021 17:21:48 -0400 Received: by mail-pg1-f182.google.com with SMTP id m21so1011100pgu.13 for ; Thu, 07 Oct 2021 14:19:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yGduMXnje8FAaWgDWJU39ddNp/YosmjrCwwkM76yp3k=; b=NC5RkKfSiNxzDPpxglx1O/uChbL5xNXAXDRHgTAcfpnoC4inPo4tB55rwNQ+43+fOx bBQQpqR4y5OjpdyzPCaRHFYI1xn3twIz6FTNLphNnBFsxcvYO3lcC59H8ojES9vcWgk2 MwHBXUp+wgCP60YdLQ9Y4bDQz917pxXFnHyhp00WcjejDweD8dMLpzY/spnJfNK23nn4 yID7A57rJJVWnWl84ArttwSEBrRV16KY8udgIjUlXpvzx9tEcKgIg7d86+FCKBOmtTSk sIdK4YBpB5ta5EcBLIyaXXZrBBkkJdCYShoXHgLk6jGIbzY9wjlP0JboYGFT0lpn+ajR Y3BQ== X-Gm-Message-State: AOAM533BA/R9Dns6XszDtC1MyO/Z529a9RNOCJy6nyulMrODOt6IiVUq Eh+H1XKbUDYpaPVUqvw7t8w= X-Google-Smtp-Source: ABdhPJyDfj9ud50B/uVjSwZE+/YnFJxJkXadNt2HwpyHn/WBNJlHLN4veACtknpbQXQ6TTOxgbY3gA== X-Received: by 2002:a62:1b92:0:b0:3eb:3f92:724 with SMTP id b140-20020a621b92000000b003eb3f920724mr6631438pfb.3.1633641594578; Thu, 07 Oct 2021 14:19:54 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:54 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , John Garry , "James E.J. Bottomley" Subject: [PATCH v2 20/46] scsi: hisi_sas: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:26 -0700 Message-Id: <20211007211852.256007-21-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 15 ++++++++++++--- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 15 ++++++++++++--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 21 +++++++++++++++------ 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c index 862f4e8b7eb5..95e2a6e3c105 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c @@ -1749,8 +1749,17 @@ static int hisi_sas_v1_init(struct hisi_hba *hisi_hba) return 0; } -static struct device_attribute *host_attrs_v1_hw[] = { - &dev_attr_phy_event_threshold, +static struct attribute *host_attrs_v1_hw[] = { + &dev_attr_phy_event_threshold.attr, + NULL +}; + +static const struct attribute_group host_attrs_v1_hw_group = { + .attrs = host_attrs_v1_hw +}; + +static const struct attribute_group *host_attrs_v1_hw_groups[] = { + &host_attrs_v1_hw_group, NULL }; @@ -1777,7 +1786,7 @@ static struct scsi_host_template sht_v1_hw = { #ifdef CONFIG_COMPAT .compat_ioctl = sas_ioctl, #endif - .shost_attrs = host_attrs_v1_hw, + .shost_groups = host_attrs_v1_hw_groups, .host_reset = hisi_sas_host_reset, }; diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c index 236cf65c2f97..26c2fa47b6ac 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c @@ -3542,8 +3542,17 @@ static void wait_cmds_complete_timeout_v2_hw(struct hisi_hba *hisi_hba, } -static struct device_attribute *host_attrs_v2_hw[] = { - &dev_attr_phy_event_threshold, +static struct attribute *host_attrs_v2_hw[] = { + &dev_attr_phy_event_threshold.attr, + NULL +}; + +static const struct attribute_group host_attrs_v2_hw_group = { + .attrs = host_attrs_v2_hw +}; + +static const struct attribute_group *host_attrs_v2_hw_groups[] = { + &host_attrs_v2_hw_group, NULL }; @@ -3590,7 +3599,7 @@ static struct scsi_host_template sht_v2_hw = { #ifdef CONFIG_COMPAT .compat_ioctl = sas_ioctl, #endif - .shost_attrs = host_attrs_v2_hw, + .shost_groups = host_attrs_v2_hw_groups, .host_reset = hisi_sas_host_reset, .map_queues = map_queues_v2_hw, .host_tagset = 1, diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index f4517f3eb922..ebd8d10112cd 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -2771,11 +2771,20 @@ static int slave_configure_v3_hw(struct scsi_device *sdev) return 0; } -static struct device_attribute *host_attrs_v3_hw[] = { - &dev_attr_phy_event_threshold, - &dev_attr_intr_conv_v3_hw, - &dev_attr_intr_coal_ticks_v3_hw, - &dev_attr_intr_coal_count_v3_hw, +static struct attribute *host_attrs_v3_hw[] = { + &dev_attr_phy_event_threshold.attr, + &dev_attr_intr_conv_v3_hw.attr, + &dev_attr_intr_coal_ticks_v3_hw.attr, + &dev_attr_intr_coal_count_v3_hw.attr, + NULL +}; + +static const struct attribute_group host_attrs_v3_hw_group = { + .attrs = host_attrs_v3_hw +}; + +static const struct attribute_group *host_attrs_v3_hw_groups[] = { + &host_attrs_v3_hw_group, NULL }; @@ -3163,7 +3172,7 @@ static struct scsi_host_template sht_v3_hw = { #ifdef CONFIG_COMPAT .compat_ioctl = sas_ioctl, #endif - .shost_attrs = host_attrs_v3_hw, + .shost_groups = host_attrs_v3_hw_groups, .tag_alloc_policy = BLK_TAG_ALLOC_RR, .host_reset = hisi_sas_host_reset, .host_tagset = 1, From patchwork Thu Oct 7 21:18:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543483 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BECEC433F5 for ; Thu, 7 Oct 2021 21:19:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5634761130 for ; Thu, 7 Oct 2021 21:19:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240304AbhJGVVw (ORCPT ); Thu, 7 Oct 2021 17:21:52 -0400 Received: from mail-pf1-f169.google.com ([209.85.210.169]:44764 "EHLO mail-pf1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234337AbhJGVVu (ORCPT ); Thu, 7 Oct 2021 17:21:50 -0400 Received: by mail-pf1-f169.google.com with SMTP id 145so6385232pfz.11 for ; Thu, 07 Oct 2021 14:19:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=558P0CCZzKFOFS9s2jNS4IcULk/D+oEkMPOVQk4B1Rk=; b=et4zJX/zXldWx3lCOJ8I5WB9N9D7l0SDmZWp3ulyHyOlYsDOqGmyzPxKbCz9PBw4Vo M5G9abbHed7tbINKUG5NabtNHQ6JCJP6m24VPn43+RsbDZch6H2LhNByWzILl1vtuhrX RM87IM213sfOd7QYpIysW3WEaWcbEdjOHnt+mtAlQNPcIKfC/Yxj6QNsw4PxW3IrKCEi ztnNcuHgDmVGZAvKmOeI69kibeSwRW1HLjKH+1sdJdjQQU5dNCW1DaIZKII2GniAm1fF po5FLRJ7kD302DcLCLxnWg1Vc46O8VNnbTucpOrpkVLHBxQqqf+/cb2KQLWICbSyev78 gXvw== X-Gm-Message-State: AOAM531MTsXv/B53YuW9Ut9MT/sajZvI0W6VW3x3xnE5llK+lJhiiIbF DcHcue3UsOLpd5BJoQpAqUc= X-Google-Smtp-Source: ABdhPJxeOvRWm8WwegCfL/JZwZwFsmoYC2oxTKnKeo3EhFfslm3Xa3dgIkmSQgqRLJjaD9yNPNEZGg== X-Received: by 2002:a63:e057:: with SMTP id n23mr1520791pgj.183.1633641595977; Thu, 07 Oct 2021 14:19:55 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:55 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Don Brace , "James E.J. Bottomley" Subject: [PATCH v2 21/46] scsi: hpsa: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:27 -0700 Message-Id: <20211007211852.256007-22-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/hpsa.c | 58 +++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 3faa87fa296a..d012c74b8d7e 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -936,30 +936,48 @@ static DEVICE_ATTR(ctlr_num, S_IRUGO, static DEVICE_ATTR(legacy_board, S_IRUGO, host_show_legacy_board, NULL); -static struct device_attribute *hpsa_sdev_attrs[] = { - &dev_attr_raid_level, - &dev_attr_lunid, - &dev_attr_unique_id, - &dev_attr_hp_ssd_smart_path_enabled, - &dev_attr_path_info, - &dev_attr_sas_address, +static struct attribute *hpsa_sdev_attrs[] = { + &dev_attr_raid_level.attr, + &dev_attr_lunid.attr, + &dev_attr_unique_id.attr, + &dev_attr_hp_ssd_smart_path_enabled.attr, + &dev_attr_path_info.attr, + &dev_attr_sas_address.attr, NULL, }; -static struct device_attribute *hpsa_shost_attrs[] = { - &dev_attr_rescan, - &dev_attr_firmware_revision, - &dev_attr_commands_outstanding, - &dev_attr_transport_mode, - &dev_attr_resettable, - &dev_attr_hp_ssd_smart_path_status, - &dev_attr_raid_offload_debug, - &dev_attr_lockup_detected, - &dev_attr_ctlr_num, - &dev_attr_legacy_board, +static const struct attribute_group hpsa_sdev_attr_group = { + .attrs = hpsa_sdev_attrs +}; + +static const struct attribute_group *hpsa_sdev_attr_groups[] = { + &hpsa_sdev_attr_group, + NULL +}; + +static struct attribute *hpsa_shost_attrs[] = { + &dev_attr_rescan.attr, + &dev_attr_firmware_revision.attr, + &dev_attr_commands_outstanding.attr, + &dev_attr_transport_mode.attr, + &dev_attr_resettable.attr, + &dev_attr_hp_ssd_smart_path_status.attr, + &dev_attr_raid_offload_debug.attr, + &dev_attr_lockup_detected.attr, + &dev_attr_ctlr_num.attr, + &dev_attr_legacy_board.attr, NULL, }; +static const struct attribute_group hpsa_shost_attr_group = { + .attrs = hpsa_shost_attrs +}; + +static const struct attribute_group *hpsa_shost_groups[] = { + &hpsa_shost_attr_group, + NULL +}; + #define HPSA_NRESERVED_CMDS (HPSA_CMDS_RESERVED_FOR_DRIVER +\ HPSA_MAX_CONCURRENT_PASSTHRUS) @@ -980,8 +998,8 @@ static struct scsi_host_template hpsa_driver_template = { #ifdef CONFIG_COMPAT .compat_ioctl = hpsa_compat_ioctl, #endif - .sdev_attrs = hpsa_sdev_attrs, - .shost_attrs = hpsa_shost_attrs, + .sdev_groups = hpsa_sdev_attr_groups, + .shost_groups = hpsa_shost_groups, .max_sectors = 2048, .no_write_same = 1, }; From patchwork Thu Oct 7 21:18:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543485 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C91E3C4332F for ; Thu, 7 Oct 2021 21:19:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF70A610A5 for ; Thu, 7 Oct 2021 21:19:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240742AbhJGVVx (ORCPT ); Thu, 7 Oct 2021 17:21:53 -0400 Received: from mail-pf1-f171.google.com ([209.85.210.171]:33718 "EHLO mail-pf1-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235027AbhJGVVv (ORCPT ); Thu, 7 Oct 2021 17:21:51 -0400 Received: by mail-pf1-f171.google.com with SMTP id s16so6463473pfk.0 for ; Thu, 07 Oct 2021 14:19:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7DNYpVKkKhZ1JECkgbXVPgTfTtQ+Re0dkc/bKlV/+CY=; b=8KDTbfOkpKQ2lw/Tviv+z8jt6Tx3U/wIVeBi/elEX8ScyrLxTOzNH0EzGxLqenPKJU ENbEXKxafYN9kT8vjgWtMP1hyuFTl4kqulWiJrg3y2Wx0DAPKak8NkAxrFpgnoNVYRp7 DO3OHVZRt20dnOCDVpOIZBLE/YcmLNcAxkKCw2BqS26+b3besxVLaDXOxhUL7JeVmSqj 29t3g641n0XNX/XRdNZ77Msoqa3DkJvT22GifNU9wN69gstOhTgdnj8e3M1Zy0Jui55H mLDFLRmz+iEJLUUnixpXQqJhCIbnAyjNEyjNANgJQ6Vfkka8ADBvpdv5wcnH2/NbNdn8 HbLg== X-Gm-Message-State: AOAM532+wKUzj6AYSZWQKgXpwsGzb6h975le2wXXquwqmXuONVra1twg ORUJx661TKdMDzkkB/CE5WA= X-Google-Smtp-Source: ABdhPJzdhDUJOPT56suXDpXsXXJfFZHvyVoq21Ng2KqUCpLEqntNYy8gXNkVKDUxxFHQ20qo2v0KzQ== X-Received: by 2002:a63:615:: with SMTP id 21mr1528025pgg.468.1633641597385; Thu, 07 Oct 2021 14:19:57 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:56 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , HighPoint Linux Team , "James E.J. Bottomley" Subject: [PATCH v2 22/46] scsi: hptiop: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:28 -0700 Message-Id: <20211007211852.256007-23-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/hptiop.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c index 61cda7b7624f..36595eec291a 100644 --- a/drivers/scsi/hptiop.c +++ b/drivers/scsi/hptiop.c @@ -1150,9 +1150,18 @@ static struct device_attribute hptiop_attr_fw_version = { .show = hptiop_show_fw_version, }; -static struct device_attribute *hptiop_attrs[] = { - &hptiop_attr_version, - &hptiop_attr_fw_version, +static struct attribute *hptiop_attrs[] = { + &hptiop_attr_version.attr, + &hptiop_attr_fw_version.attr, + NULL +}; + +static const struct attribute_group hptiop_attr_group = { + .attrs = hptiop_attrs +}; + +static const struct attribute_group *hptiop_attr_groups[] = { + &hptiop_attr_group, NULL }; @@ -1172,7 +1181,7 @@ static struct scsi_host_template driver_template = { .info = hptiop_info, .emulated = 0, .proc_name = driver_name, - .shost_attrs = hptiop_attrs, + .shost_groups = hptiop_attr_groups, .slave_configure = hptiop_slave_config, .this_id = -1, .change_queue_depth = hptiop_adjust_disk_queue_depth, From patchwork Thu Oct 7 21:18:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543487 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1587C433EF for ; Thu, 7 Oct 2021 21:20:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF32B610A0 for ; Thu, 7 Oct 2021 21:20:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235027AbhJGVVz (ORCPT ); Thu, 7 Oct 2021 17:21:55 -0400 Received: from mail-pj1-f44.google.com ([209.85.216.44]:45689 "EHLO mail-pj1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240647AbhJGVVx (ORCPT ); Thu, 7 Oct 2021 17:21:53 -0400 Received: by mail-pj1-f44.google.com with SMTP id ls14-20020a17090b350e00b001a00e2251c8so6190110pjb.4 for ; Thu, 07 Oct 2021 14:19:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xVUJOXbf823uhhp9zXXJdESGWghAuwZbboXoOCO4TQ8=; b=O0cRFRMRvWZvoDahwFw+ShSMx+sgbeaiO2P7S8P447k3tLEXuD4IY2ykfMBRpkzsiD rEDpyAzSUAs5WZgNVye1dvcOEgom9zjYUDPXAnD3LpCNSpNDXFJKev006d61RJsg2gzR iEpU2AT7YQt7NqxmLTfdkY/qDpHYIjz+VGRnEuvJmrlX5b21duEVjeUN4N7/2fbYUT4F qiUXi9LuxTnWl39C7edzxCBMWOOQ39YrS/Av5ZOftLegS8sR0xCKtmq9FkSPPspndAyj mkY2nNGFB3DP5k/Nmg9nmqSFd5RZ6Uk/gP9YAwu2/3xrrcgd/a54V79J5mG7XOhTpIlS H69w== X-Gm-Message-State: AOAM5337VOwa+rDMyitoY9VlZeF5QKJ/mzaiYw8sysQG1H+Xhzw3SUNk MKBYdGbK4VLdd4z8LH12u3Y0FMyf4ZImMA== X-Google-Smtp-Source: ABdhPJxCOyHPw3L5fssXZG9w/WsxzttMretL2Fd4ZsdLAmR92kTJthLDvdEsSGiStRQlwNhMCTLwdQ== X-Received: by 2002:a17:902:6b0b:b0:13a:18bf:1ece with SMTP id o11-20020a1709026b0b00b0013a18bf1ecemr5813538plk.49.1633641598846; Thu, 07 Oct 2021 14:19:58 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:58 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Tyrel Datwyler , Michael Ellerman , "James E.J. Bottomley" Subject: [PATCH v2 23/46] scsi: ibmvscsi: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:29 -0700 Message-Id: <20211007211852.256007-24-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/ibmvscsi/ibmvscsi.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 50df7dd9cb91..b73009a7ad34 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c @@ -2064,15 +2064,24 @@ static int ibmvscsi_host_reset(struct Scsi_Host *shost, int reset_type) return 0; } -static struct device_attribute *ibmvscsi_attrs[] = { - &ibmvscsi_host_vhost_loc, - &ibmvscsi_host_vhost_name, - &ibmvscsi_host_srp_version, - &ibmvscsi_host_partition_name, - &ibmvscsi_host_partition_number, - &ibmvscsi_host_mad_version, - &ibmvscsi_host_os_type, - &ibmvscsi_host_config, +static struct attribute *ibmvscsi_attrs[] = { + &ibmvscsi_host_vhost_loc.attr, + &ibmvscsi_host_vhost_name.attr, + &ibmvscsi_host_srp_version.attr, + &ibmvscsi_host_partition_name.attr, + &ibmvscsi_host_partition_number.attr, + &ibmvscsi_host_mad_version.attr, + &ibmvscsi_host_os_type.attr, + &ibmvscsi_host_config.attr, + NULL +}; + +static const struct attribute_group ibmvscsi_attr_group = { + .attrs = ibmvscsi_attrs +}; + +static const struct attribute_group *ibmvscsi_attr_groups[] = { + &ibmvscsi_attr_group, NULL }; @@ -2095,7 +2104,7 @@ static struct scsi_host_template driver_template = { .can_queue = IBMVSCSI_MAX_REQUESTS_DEFAULT, .this_id = -1, .sg_tablesize = SG_ALL, - .shost_attrs = ibmvscsi_attrs, + .shost_groups = ibmvscsi_attr_groups, }; /** From patchwork Thu Oct 7 21:18:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543489 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 637ECC433FE for ; Thu, 7 Oct 2021 21:20:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 48D7A610A0 for ; Thu, 7 Oct 2021 21:20:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240802AbhJGVVz (ORCPT ); Thu, 7 Oct 2021 17:21:55 -0400 Received: from mail-pj1-f54.google.com ([209.85.216.54]:41645 "EHLO mail-pj1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234337AbhJGVVy (ORCPT ); Thu, 7 Oct 2021 17:21:54 -0400 Received: by mail-pj1-f54.google.com with SMTP id na16-20020a17090b4c1000b0019f5bb661f9so6249149pjb.0 for ; Thu, 07 Oct 2021 14:20:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GBk7F5v/DTW0X2Hks3jWI0V82MApL0eXANA8Nxw+P90=; b=rAuRmGZWOte8/6UDvWx616naGLnRC+c9GvwKwdPQAGSn98fU3lZHFOHudQHIusxcBL FZvQrT9VQz2mtjW9T4QpBLfYHNz62rx18LeSTSfInu6sN9vV1HKtsmMu+nwtHM9uRwYo 3vyt5JfeRojFA4ULuN3LBhNgRJG0Fy5AOTa1pOJy48XYTk17aMNMNMVKbQ8+iuznE2gA ki7IrxY4p3C29YZWehzXRHMOX12LwWzAda39np08zy5Vhq1cW/k3caPL/nYyUdWyht6d 49D6VdHC50Q2zf0O/2oOoPBzsM0vt+QHDq/7RU7CNeAM9eFb8fvpDOR/IvqU1vhnXfbJ fHLg== X-Gm-Message-State: AOAM531ZsjETfgjCOWVuBgirq32PJdlGQ9/qUUumYiryosCScfj2/mvg SFvGbx/RcL41iqUlpUzyju0= X-Google-Smtp-Source: ABdhPJzgpx/vAAvFKxA3p27guZO+oYfRLYeLZ6lsWtAoUoJP5etbS8JEaXHfsFojliVavsGUoLo4kQ== X-Received: by 2002:a17:902:dacf:b0:13e:ab53:87dc with SMTP id q15-20020a170902dacf00b0013eab5387dcmr5994690plx.78.1633641600325; Thu, 07 Oct 2021 14:20:00 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:19:59 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Tyrel Datwyler , Michael Ellerman , "James E.J. Bottomley" Subject: [PATCH v2 24/46] scsi: ibmvfc: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:30 -0700 Message-Id: <20211007211852.256007-25-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/ibmvscsi/ibmvfc.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index 1f1586ad48fe..d4509b043d86 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -3588,15 +3588,24 @@ static struct bin_attribute ibmvfc_trace_attr = { }; #endif -static struct device_attribute *ibmvfc_attrs[] = { - &dev_attr_partition_name, - &dev_attr_device_name, - &dev_attr_port_loc_code, - &dev_attr_drc_name, - &dev_attr_npiv_version, - &dev_attr_capabilities, - &dev_attr_log_level, - &dev_attr_nr_scsi_channels, +static struct attribute *ibmvfc_attrs[] = { + &dev_attr_partition_name.attr, + &dev_attr_device_name.attr, + &dev_attr_port_loc_code.attr, + &dev_attr_drc_name.attr, + &dev_attr_npiv_version.attr, + &dev_attr_capabilities.attr, + &dev_attr_log_level.attr, + &dev_attr_nr_scsi_channels.attr, + NULL +}; + +static const struct attribute_group ibmvfc_attr_group = { + .attrs = ibmvfc_attrs +}; + +static const struct attribute_group *ibmvfc_attr_groups[] = { + &ibmvfc_attr_group, NULL }; @@ -3620,7 +3629,7 @@ static struct scsi_host_template driver_template = { .this_id = -1, .sg_tablesize = SG_ALL, .max_sectors = IBMVFC_MAX_SECTORS, - .shost_attrs = ibmvfc_attrs, + .shost_groups = ibmvfc_attr_groups, .track_queue_depth = 1, .host_tagset = 1, }; From patchwork Thu Oct 7 21:18:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543491 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E0A8C433F5 for ; Thu, 7 Oct 2021 21:20:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 467EB610A5 for ; Thu, 7 Oct 2021 21:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240908AbhJGVV6 (ORCPT ); Thu, 7 Oct 2021 17:21:58 -0400 Received: from mail-pj1-f41.google.com ([209.85.216.41]:46774 "EHLO mail-pj1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234337AbhJGVV4 (ORCPT ); Thu, 7 Oct 2021 17:21:56 -0400 Received: by mail-pj1-f41.google.com with SMTP id pi19-20020a17090b1e5300b0019fdd3557d3so6190453pjb.5 for ; Thu, 07 Oct 2021 14:20:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=718LRFgqd69ly4OA91qx9c7cRSF8wKoNhPwyqmALI/g=; b=aTUGhoipVPAkn/LThehU6av4Eh9GYRkTyUl1vlQ8eciIYPjx2g4Rl03d6cmVPyueh8 JL9KkU/t1HiH5qb2JLTql3BEBoz/c7QDmcJzpARlhwDYz9bkJAGg5TbMs2DMCtndqSsR w4LeJc6M9usAwiRxjTbb1LRvtCgLgteHlT4LjoxkVWgLx0FgEbN5ZmuSdchnFGBr6Eha Xr/c5Dg5HB0rqdGM8ykQAdmJn6IKG/5FIswC3yRJMzpRrAhE4GGhG/xwP581MzYYbxb+ OUrYidhxhAqqTl07JZjx5/QkLhNlll1tQiOncjUtAe/8Z7+l6Yvdhknqms8dpYUs9zhH 3LJg== X-Gm-Message-State: AOAM530z2qtNZQGe0zKZdl8jRat78WlyMYlEk5Oln7UjbI8c6Gi7SRZs NwPfDKMBlNEaAgDagfCBwmA= X-Google-Smtp-Source: ABdhPJz1ocDH83w2nrWPHFDGQT1Xrvfn2/6CVqEpdBW1VXhsJEMASlo96yklYovodgaDQtOr0n2Orw== X-Received: by 2002:a17:902:b213:b0:13e:cd44:b4b5 with SMTP id t19-20020a170902b21300b0013ecd44b4b5mr5876982plr.18.1633641601758; Thu, 07 Oct 2021 14:20:01 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:01 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Brian King , "James E.J. Bottomley" Subject: [PATCH v2 25/46] scsi: ipr: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:31 -0700 Message-Id: <20211007211852.256007-26-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/ipr.c | 52 +++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 5d78f7e939a3..c872a28b8d5e 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -4236,18 +4236,27 @@ static struct bin_attribute ipr_ioa_async_err_log = { .write = ipr_next_async_err_log }; -static struct device_attribute *ipr_ioa_attrs[] = { - &ipr_fw_version_attr, - &ipr_log_level_attr, - &ipr_diagnostics_attr, - &ipr_ioa_state_attr, - &ipr_ioa_reset_attr, - &ipr_update_fw_attr, - &ipr_ioa_fw_type_attr, - &ipr_iopoll_weight_attr, +static struct attribute *ipr_ioa_attrs[] = { + &ipr_fw_version_attr.attr, + &ipr_log_level_attr.attr, + &ipr_diagnostics_attr.attr, + &ipr_ioa_state_attr.attr, + &ipr_ioa_reset_attr.attr, + &ipr_update_fw_attr.attr, + &ipr_ioa_fw_type_attr.attr, + &ipr_iopoll_weight_attr.attr, NULL, }; +static const struct attribute_group ipr_ioa_attr_group = { + .attrs = ipr_ioa_attrs +}; + +static const struct attribute_group *ipr_ioa_attr_groups[] = { + &ipr_ioa_attr_group, + NULL +}; + #ifdef CONFIG_SCSI_IPR_DUMP /** * ipr_read_dump - Dump the adapter @@ -4732,15 +4741,24 @@ static struct device_attribute ipr_raw_mode_attr = { .store = ipr_store_raw_mode }; -static struct device_attribute *ipr_dev_attrs[] = { - &ipr_adapter_handle_attr, - &ipr_resource_path_attr, - &ipr_device_id_attr, - &ipr_resource_type_attr, - &ipr_raw_mode_attr, +static struct attribute *ipr_dev_attrs[] = { + &ipr_adapter_handle_attr.attr, + &ipr_resource_path_attr.attr, + &ipr_device_id_attr.attr, + &ipr_resource_type_attr.attr, + &ipr_raw_mode_attr.attr, NULL, }; +static const struct attribute_group ipr_dev_attr_group = { + .attrs = ipr_dev_attrs +}; + +static const struct attribute_group *ipr_dev_attr_groups[] = { + &ipr_dev_attr_group, + NULL +}; + /** * ipr_biosparam - Return the HSC mapping * @sdev: scsi device struct @@ -6762,8 +6780,8 @@ static struct scsi_host_template driver_template = { .sg_tablesize = IPR_MAX_SGLIST, .max_sectors = IPR_IOA_MAX_SECTORS, .cmd_per_lun = IPR_MAX_CMD_PER_LUN, - .shost_attrs = ipr_ioa_attrs, - .sdev_attrs = ipr_dev_attrs, + .shost_groups = ipr_ioa_attr_groups, + .sdev_groups = ipr_dev_attr_groups, .proc_name = IPR_NAME, }; From patchwork Thu Oct 7 21:18:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543493 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DEC7C433FE for ; Thu, 7 Oct 2021 21:20:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 20AE061077 for ; Thu, 7 Oct 2021 21:20:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240809AbhJGVWA (ORCPT ); Thu, 7 Oct 2021 17:22:00 -0400 Received: from mail-pj1-f46.google.com ([209.85.216.46]:55854 "EHLO mail-pj1-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240816AbhJGVV5 (ORCPT ); Thu, 7 Oct 2021 17:21:57 -0400 Received: by mail-pj1-f46.google.com with SMTP id on6so5889696pjb.5 for ; Thu, 07 Oct 2021 14:20:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7TNx97LLmUQsTBLc+IBu2Z/Z4w2d3Be8G2j9YSn8di4=; b=QsOLVIq8XuZfFwMzau3zSGBp1kABG5/8U5KfEkXifyBWumg/hYObzqdS8gzYQ3ROdq Myw0FyXdPclzjwrTFkWttpMjT7BCl0N9xZ7EloKfd9hdXDY3+qI+3tSjrS4CDKVBaNCC EL+BJyf4NBGOk4B7mXFuyHOexWAoGP/SyucUyucusKIelZu+jNJp4LFLEP1ibEQ4RIgh PCVdTWZA15/U0K4fxwOmaIXDBoriJ8yWy+7GL5V3JWM5WkvnQHNRKrVu3z5kkII2w8hG /jeEJoByOk+fYtS+GeljVl2i/WKxT5LHjdrkgrGRQ3wSn7sXa6p1wsjZm6st3XEqzqJ7 pZrA== X-Gm-Message-State: AOAM530ybyg0Y/UTLMP/nR4PtAO2zWYfB5G23OWqgxtEknM/mc7uQSd6 U0hfZz1u8tu5LbsaS/ipn5I= X-Google-Smtp-Source: ABdhPJwYa/xu52JeXQbyVRsCrMtCQ+0p8wwvaUb2Ix6GZh/jAl5gsYNkM3DKGhBoQxftK+qwTdEjiw== X-Received: by 2002:a17:902:be0f:b0:13a:19b6:6870 with SMTP id r15-20020a170902be0f00b0013a19b66870mr5970264pls.64.1633641603156; Thu, 07 Oct 2021 14:20:03 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:02 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Artur Paszkiewicz , "James E.J. Bottomley" Subject: [PATCH v2 26/46] scsi: isci: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:32 -0700 Message-Id: <20211007211852.256007-27-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/isci/init.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index ffd33e5decae..ae7b6baade99 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -142,8 +142,17 @@ static ssize_t isci_show_id(struct device *dev, struct device_attribute *attr, c static DEVICE_ATTR(isci_id, S_IRUGO, isci_show_id, NULL); -static struct device_attribute *isci_host_attrs[] = { - &dev_attr_isci_id, +static struct attribute *isci_host_attrs[] = { + &dev_attr_isci_id.attr, + NULL +}; + +static const struct attribute_group isci_host_attr_group = { + .attrs = isci_host_attrs +}; + +static const struct attribute_group *isci_host_attr_groups[] = { + &isci_host_attr_group, NULL }; @@ -173,7 +182,7 @@ static struct scsi_host_template isci_sht = { #ifdef CONFIG_COMPAT .compat_ioctl = sas_ioctl, #endif - .shost_attrs = isci_host_attrs, + .shost_groups = isci_host_attr_groups, .track_queue_depth = 1, }; From patchwork Thu Oct 7 21:18:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543495 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98406C433F5 for ; Thu, 7 Oct 2021 21:20:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D819610A5 for ; Thu, 7 Oct 2021 21:20:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238287AbhJGVWB (ORCPT ); Thu, 7 Oct 2021 17:22:01 -0400 Received: from mail-pj1-f45.google.com ([209.85.216.45]:40715 "EHLO mail-pj1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240643AbhJGVV7 (ORCPT ); Thu, 7 Oct 2021 17:21:59 -0400 Received: by mail-pj1-f45.google.com with SMTP id pf6-20020a17090b1d8600b0019fa884ab85so7908172pjb.5 for ; Thu, 07 Oct 2021 14:20:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9u4GISVotQ7wq2cUYk/0BmpFVxH0/IJZGzhXVJeCLXo=; b=Ufm+hrPMdZE93gyrtc/HN7iPEIGf5qI2tdMV5B9PkCVMbQeAGnxv1SkYLyxAHtPQJr d/g1LgVSns3qFH8d0uHYMc6ifvDAcdTlJFIlStKcebgeIazsI0tlOW2Jn3SoD8G/kdjI 7/o3ENVLwzuWAPlWBCK6YW+LDHN87luDgcyBEL4xzjiJVL+SCgpD4Q/lTwZ5A97f+3EL 1ZKdm7s1tPCRW8Q/hB14PzSlEGbyTSfBDd3ouSFOgXNQjeok1UDd2xaTD/HFnx0s+uHU gUb9AIxWL/Anx6ATBTpgFLYBAyykPfDp8Q1TSKyw/UpUMXHwaMkZ1vg6XdpAfFpZNmeW 07og== X-Gm-Message-State: AOAM532qBTAQSZvb8UB63F9ZSV0Gp0QoDukGLOiVymhPsX+SBTCvPoS2 xLmZ+3mAbmcjsNYEW08QvLk= X-Google-Smtp-Source: ABdhPJxMcSZItQ4NrsrUibvcxRuLdzZzwsQ18qWir3lSPTQOZDrZtqUmnuK/l1DMBzQ2/M7b5S7f9A== X-Received: by 2002:a17:90a:1942:: with SMTP id 2mr7969554pjh.195.1633641605069; Thu, 07 Oct 2021 14:20:05 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:04 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , James Smart , Dick Kennedy , "James E.J. Bottomley" Subject: [PATCH v2 27/46] scsi: lpfc: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:33 -0700 Message-Id: <20211007211852.256007-28-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/lpfc/lpfc_attr.c | 314 ++++++++++++++++++---------------- drivers/scsi/lpfc/lpfc_crtn.h | 4 +- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_scsi.c | 4 +- 4 files changed, 171 insertions(+), 153 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index b35bf70a8c0d..13885d3c7b7a 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c @@ -6396,160 +6396,178 @@ LPFC_ATTR_RW(vmid_priority_tagging, LPFC_VMID_PRIO_TAG_DISABLE, LPFC_VMID_PRIO_TAG_ALL_TARGETS, "Enable Priority Tagging VMID support"); -struct device_attribute *lpfc_hba_attrs[] = { - &dev_attr_nvme_info, - &dev_attr_scsi_stat, - &dev_attr_bg_info, - &dev_attr_bg_guard_err, - &dev_attr_bg_apptag_err, - &dev_attr_bg_reftag_err, - &dev_attr_info, - &dev_attr_serialnum, - &dev_attr_modeldesc, - &dev_attr_modelname, - &dev_attr_programtype, - &dev_attr_portnum, - &dev_attr_fwrev, - &dev_attr_hdw, - &dev_attr_option_rom_version, - &dev_attr_link_state, - &dev_attr_num_discovered_ports, - &dev_attr_menlo_mgmt_mode, - &dev_attr_lpfc_drvr_version, - &dev_attr_lpfc_enable_fip, - &dev_attr_lpfc_temp_sensor, - &dev_attr_lpfc_log_verbose, - &dev_attr_lpfc_lun_queue_depth, - &dev_attr_lpfc_tgt_queue_depth, - &dev_attr_lpfc_hba_queue_depth, - &dev_attr_lpfc_peer_port_login, - &dev_attr_lpfc_nodev_tmo, - &dev_attr_lpfc_devloss_tmo, - &dev_attr_lpfc_enable_fc4_type, - &dev_attr_lpfc_fcp_class, - &dev_attr_lpfc_use_adisc, - &dev_attr_lpfc_first_burst_size, - &dev_attr_lpfc_ack0, - &dev_attr_lpfc_xri_rebalancing, - &dev_attr_lpfc_topology, - &dev_attr_lpfc_scan_down, - &dev_attr_lpfc_link_speed, - &dev_attr_lpfc_fcp_io_sched, - &dev_attr_lpfc_ns_query, - &dev_attr_lpfc_fcp2_no_tgt_reset, - &dev_attr_lpfc_cr_delay, - &dev_attr_lpfc_cr_count, - &dev_attr_lpfc_multi_ring_support, - &dev_attr_lpfc_multi_ring_rctl, - &dev_attr_lpfc_multi_ring_type, - &dev_attr_lpfc_fdmi_on, - &dev_attr_lpfc_enable_SmartSAN, - &dev_attr_lpfc_max_luns, - &dev_attr_lpfc_enable_npiv, - &dev_attr_lpfc_fcf_failover_policy, - &dev_attr_lpfc_enable_rrq, - &dev_attr_lpfc_fcp_wait_abts_rsp, - &dev_attr_nport_evt_cnt, - &dev_attr_board_mode, - &dev_attr_max_vpi, - &dev_attr_used_vpi, - &dev_attr_max_rpi, - &dev_attr_used_rpi, - &dev_attr_max_xri, - &dev_attr_used_xri, - &dev_attr_npiv_info, - &dev_attr_issue_reset, - &dev_attr_lpfc_poll, - &dev_attr_lpfc_poll_tmo, - &dev_attr_lpfc_task_mgmt_tmo, - &dev_attr_lpfc_use_msi, - &dev_attr_lpfc_nvme_oas, - &dev_attr_lpfc_nvme_embed_cmd, - &dev_attr_lpfc_fcp_imax, - &dev_attr_lpfc_force_rscn, - &dev_attr_lpfc_cq_poll_threshold, - &dev_attr_lpfc_cq_max_proc_limit, - &dev_attr_lpfc_fcp_cpu_map, - &dev_attr_lpfc_fcp_mq_threshold, - &dev_attr_lpfc_hdw_queue, - &dev_attr_lpfc_irq_chann, - &dev_attr_lpfc_suppress_rsp, - &dev_attr_lpfc_nvmet_mrq, - &dev_attr_lpfc_nvmet_mrq_post, - &dev_attr_lpfc_nvme_enable_fb, - &dev_attr_lpfc_nvmet_fb_size, - &dev_attr_lpfc_enable_bg, - &dev_attr_lpfc_soft_wwnn, - &dev_attr_lpfc_soft_wwpn, - &dev_attr_lpfc_soft_wwn_enable, - &dev_attr_lpfc_enable_hba_reset, - &dev_attr_lpfc_enable_hba_heartbeat, - &dev_attr_lpfc_EnableXLane, - &dev_attr_lpfc_XLanePriority, - &dev_attr_lpfc_xlane_lun, - &dev_attr_lpfc_xlane_tgt, - &dev_attr_lpfc_xlane_vpt, - &dev_attr_lpfc_xlane_lun_state, - &dev_attr_lpfc_xlane_lun_status, - &dev_attr_lpfc_xlane_priority, - &dev_attr_lpfc_sg_seg_cnt, - &dev_attr_lpfc_max_scsicmpl_time, - &dev_attr_lpfc_stat_data_ctrl, - &dev_attr_lpfc_aer_support, - &dev_attr_lpfc_aer_state_cleanup, - &dev_attr_lpfc_sriov_nr_virtfn, - &dev_attr_lpfc_req_fw_upgrade, - &dev_attr_lpfc_suppress_link_up, - &dev_attr_iocb_hw, - &dev_attr_pls, - &dev_attr_pt, - &dev_attr_txq_hw, - &dev_attr_txcmplq_hw, - &dev_attr_lpfc_sriov_hw_max_virtfn, - &dev_attr_protocol, - &dev_attr_lpfc_xlane_supported, - &dev_attr_lpfc_enable_mds_diags, - &dev_attr_lpfc_ras_fwlog_buffsize, - &dev_attr_lpfc_ras_fwlog_level, - &dev_attr_lpfc_ras_fwlog_func, - &dev_attr_lpfc_enable_bbcr, - &dev_attr_lpfc_enable_dpp, - &dev_attr_lpfc_enable_mi, - &dev_attr_cmf_info, - &dev_attr_lpfc_max_vmid, - &dev_attr_lpfc_vmid_inactivity_timeout, - &dev_attr_lpfc_vmid_app_header, - &dev_attr_lpfc_vmid_priority_tagging, +static struct attribute *lpfc_hba_attrs[] = { + &dev_attr_nvme_info.attr, + &dev_attr_scsi_stat.attr, + &dev_attr_bg_info.attr, + &dev_attr_bg_guard_err.attr, + &dev_attr_bg_apptag_err.attr, + &dev_attr_bg_reftag_err.attr, + &dev_attr_info.attr, + &dev_attr_serialnum.attr, + &dev_attr_modeldesc.attr, + &dev_attr_modelname.attr, + &dev_attr_programtype.attr, + &dev_attr_portnum.attr, + &dev_attr_fwrev.attr, + &dev_attr_hdw.attr, + &dev_attr_option_rom_version.attr, + &dev_attr_link_state.attr, + &dev_attr_num_discovered_ports.attr, + &dev_attr_menlo_mgmt_mode.attr, + &dev_attr_lpfc_drvr_version.attr, + &dev_attr_lpfc_enable_fip.attr, + &dev_attr_lpfc_temp_sensor.attr, + &dev_attr_lpfc_log_verbose.attr, + &dev_attr_lpfc_lun_queue_depth.attr, + &dev_attr_lpfc_tgt_queue_depth.attr, + &dev_attr_lpfc_hba_queue_depth.attr, + &dev_attr_lpfc_peer_port_login.attr, + &dev_attr_lpfc_nodev_tmo.attr, + &dev_attr_lpfc_devloss_tmo.attr, + &dev_attr_lpfc_enable_fc4_type.attr, + &dev_attr_lpfc_fcp_class.attr, + &dev_attr_lpfc_use_adisc.attr, + &dev_attr_lpfc_first_burst_size.attr, + &dev_attr_lpfc_ack0.attr, + &dev_attr_lpfc_xri_rebalancing.attr, + &dev_attr_lpfc_topology.attr, + &dev_attr_lpfc_scan_down.attr, + &dev_attr_lpfc_link_speed.attr, + &dev_attr_lpfc_fcp_io_sched.attr, + &dev_attr_lpfc_ns_query.attr, + &dev_attr_lpfc_fcp2_no_tgt_reset.attr, + &dev_attr_lpfc_cr_delay.attr, + &dev_attr_lpfc_cr_count.attr, + &dev_attr_lpfc_multi_ring_support.attr, + &dev_attr_lpfc_multi_ring_rctl.attr, + &dev_attr_lpfc_multi_ring_type.attr, + &dev_attr_lpfc_fdmi_on.attr, + &dev_attr_lpfc_enable_SmartSAN.attr, + &dev_attr_lpfc_max_luns.attr, + &dev_attr_lpfc_enable_npiv.attr, + &dev_attr_lpfc_fcf_failover_policy.attr, + &dev_attr_lpfc_enable_rrq.attr, + &dev_attr_lpfc_fcp_wait_abts_rsp.attr, + &dev_attr_nport_evt_cnt.attr, + &dev_attr_board_mode.attr, + &dev_attr_max_vpi.attr, + &dev_attr_used_vpi.attr, + &dev_attr_max_rpi.attr, + &dev_attr_used_rpi.attr, + &dev_attr_max_xri.attr, + &dev_attr_used_xri.attr, + &dev_attr_npiv_info.attr, + &dev_attr_issue_reset.attr, + &dev_attr_lpfc_poll.attr, + &dev_attr_lpfc_poll_tmo.attr, + &dev_attr_lpfc_task_mgmt_tmo.attr, + &dev_attr_lpfc_use_msi.attr, + &dev_attr_lpfc_nvme_oas.attr, + &dev_attr_lpfc_nvme_embed_cmd.attr, + &dev_attr_lpfc_fcp_imax.attr, + &dev_attr_lpfc_force_rscn.attr, + &dev_attr_lpfc_cq_poll_threshold.attr, + &dev_attr_lpfc_cq_max_proc_limit.attr, + &dev_attr_lpfc_fcp_cpu_map.attr, + &dev_attr_lpfc_fcp_mq_threshold.attr, + &dev_attr_lpfc_hdw_queue.attr, + &dev_attr_lpfc_irq_chann.attr, + &dev_attr_lpfc_suppress_rsp.attr, + &dev_attr_lpfc_nvmet_mrq.attr, + &dev_attr_lpfc_nvmet_mrq_post.attr, + &dev_attr_lpfc_nvme_enable_fb.attr, + &dev_attr_lpfc_nvmet_fb_size.attr, + &dev_attr_lpfc_enable_bg.attr, + &dev_attr_lpfc_soft_wwnn.attr, + &dev_attr_lpfc_soft_wwpn.attr, + &dev_attr_lpfc_soft_wwn_enable.attr, + &dev_attr_lpfc_enable_hba_reset.attr, + &dev_attr_lpfc_enable_hba_heartbeat.attr, + &dev_attr_lpfc_EnableXLane.attr, + &dev_attr_lpfc_XLanePriority.attr, + &dev_attr_lpfc_xlane_lun.attr, + &dev_attr_lpfc_xlane_tgt.attr, + &dev_attr_lpfc_xlane_vpt.attr, + &dev_attr_lpfc_xlane_lun_state.attr, + &dev_attr_lpfc_xlane_lun_status.attr, + &dev_attr_lpfc_xlane_priority.attr, + &dev_attr_lpfc_sg_seg_cnt.attr, + &dev_attr_lpfc_max_scsicmpl_time.attr, + &dev_attr_lpfc_stat_data_ctrl.attr, + &dev_attr_lpfc_aer_support.attr, + &dev_attr_lpfc_aer_state_cleanup.attr, + &dev_attr_lpfc_sriov_nr_virtfn.attr, + &dev_attr_lpfc_req_fw_upgrade.attr, + &dev_attr_lpfc_suppress_link_up.attr, + &dev_attr_iocb_hw.attr, + &dev_attr_pls.attr, + &dev_attr_pt.attr, + &dev_attr_txq_hw.attr, + &dev_attr_txcmplq_hw.attr, + &dev_attr_lpfc_sriov_hw_max_virtfn.attr, + &dev_attr_protocol.attr, + &dev_attr_lpfc_xlane_supported.attr, + &dev_attr_lpfc_enable_mds_diags.attr, + &dev_attr_lpfc_ras_fwlog_buffsize.attr, + &dev_attr_lpfc_ras_fwlog_level.attr, + &dev_attr_lpfc_ras_fwlog_func.attr, + &dev_attr_lpfc_enable_bbcr.attr, + &dev_attr_lpfc_enable_dpp.attr, + &dev_attr_lpfc_enable_mi.attr, + &dev_attr_cmf_info.attr, + &dev_attr_lpfc_max_vmid.attr, + &dev_attr_lpfc_vmid_inactivity_timeout.attr, + &dev_attr_lpfc_vmid_app_header.attr, + &dev_attr_lpfc_vmid_priority_tagging.attr, NULL, }; -struct device_attribute *lpfc_vport_attrs[] = { - &dev_attr_info, - &dev_attr_link_state, - &dev_attr_num_discovered_ports, - &dev_attr_lpfc_drvr_version, - &dev_attr_lpfc_log_verbose, - &dev_attr_lpfc_lun_queue_depth, - &dev_attr_lpfc_tgt_queue_depth, - &dev_attr_lpfc_nodev_tmo, - &dev_attr_lpfc_devloss_tmo, - &dev_attr_lpfc_hba_queue_depth, - &dev_attr_lpfc_peer_port_login, - &dev_attr_lpfc_restrict_login, - &dev_attr_lpfc_fcp_class, - &dev_attr_lpfc_use_adisc, - &dev_attr_lpfc_first_burst_size, - &dev_attr_lpfc_max_luns, - &dev_attr_nport_evt_cnt, - &dev_attr_npiv_info, - &dev_attr_lpfc_enable_da_id, - &dev_attr_lpfc_max_scsicmpl_time, - &dev_attr_lpfc_stat_data_ctrl, - &dev_attr_lpfc_static_vport, - &dev_attr_cmf_info, +static const struct attribute_group lpfc_hba_attr_group = { + .attrs = lpfc_hba_attrs +}; + +const struct attribute_group *lpfc_hba_attr_groups[] = { + &lpfc_hba_attr_group, + NULL +}; + +static struct attribute *lpfc_vport_attrs[] = { + &dev_attr_info.attr, + &dev_attr_link_state.attr, + &dev_attr_num_discovered_ports.attr, + &dev_attr_lpfc_drvr_version.attr, + &dev_attr_lpfc_log_verbose.attr, + &dev_attr_lpfc_lun_queue_depth.attr, + &dev_attr_lpfc_tgt_queue_depth.attr, + &dev_attr_lpfc_nodev_tmo.attr, + &dev_attr_lpfc_devloss_tmo.attr, + &dev_attr_lpfc_hba_queue_depth.attr, + &dev_attr_lpfc_peer_port_login.attr, + &dev_attr_lpfc_restrict_login.attr, + &dev_attr_lpfc_fcp_class.attr, + &dev_attr_lpfc_use_adisc.attr, + &dev_attr_lpfc_first_burst_size.attr, + &dev_attr_lpfc_max_luns.attr, + &dev_attr_nport_evt_cnt.attr, + &dev_attr_npiv_info.attr, + &dev_attr_lpfc_enable_da_id.attr, + &dev_attr_lpfc_max_scsicmpl_time.attr, + &dev_attr_lpfc_stat_data_ctrl.attr, + &dev_attr_lpfc_static_vport.attr, + &dev_attr_cmf_info.attr, NULL, }; +static const struct attribute_group lpfc_vport_attr_group = { + .attrs = lpfc_vport_attrs +}; + +const struct attribute_group *lpfc_vport_attr_groups[] = { + &lpfc_vport_attr_group, + NULL +}; + /** * sysfs_ctlreg_write - Write method for writing to ctlreg * @filp: open sysfs file diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h index c512f4199142..edac092eb0dd 100644 --- a/drivers/scsi/lpfc/lpfc_crtn.h +++ b/drivers/scsi/lpfc/lpfc_crtn.h @@ -428,8 +428,8 @@ void lpfc_get_cfgparam(struct lpfc_hba *); void lpfc_get_vport_cfgparam(struct lpfc_vport *); int lpfc_alloc_sysfs_attr(struct lpfc_vport *); void lpfc_free_sysfs_attr(struct lpfc_vport *); -extern struct device_attribute *lpfc_hba_attrs[]; -extern struct device_attribute *lpfc_vport_attrs[]; +extern const struct attribute_group *lpfc_hba_attr_groups[]; +extern const struct attribute_group *lpfc_vport_attr_groups[]; extern struct scsi_host_template lpfc_template; extern struct scsi_host_template lpfc_template_nvme; extern struct fc_function_template lpfc_transport_functions; diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index ea8f929eb3f7..33b4912eccab 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -4574,7 +4574,7 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev) /* Template for all vports this physical port creates */ memcpy(&phba->vport_template, &lpfc_template, sizeof(*template)); - phba->vport_template.shost_attrs = lpfc_vport_attrs; + phba->vport_template.shost_groups = lpfc_vport_attr_groups; phba->vport_template.eh_bus_reset_handler = NULL; phba->vport_template.eh_host_reset_handler = NULL; phba->vport_template.vendor_id = 0; diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 17e677cf8dcd..ac2e297945bd 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -7203,7 +7203,7 @@ struct scsi_host_template lpfc_template_nvme = { .this_id = -1, .sg_tablesize = 1, .cmd_per_lun = 1, - .shost_attrs = lpfc_hba_attrs, + .shost_groups = lpfc_hba_attr_groups, .max_sectors = 0xFFFFFFFF, .vendor_id = LPFC_NL_VENDOR_ID, .track_queue_depth = 0, @@ -7229,7 +7229,7 @@ struct scsi_host_template lpfc_template = { .this_id = -1, .sg_tablesize = LPFC_DEFAULT_SG_SEG_CNT, .cmd_per_lun = LPFC_CMD_PER_LUN, - .shost_attrs = lpfc_hba_attrs, + .shost_groups = lpfc_hba_attr_groups, .max_sectors = 0xFFFFFFFF, .vendor_id = LPFC_NL_VENDOR_ID, .change_queue_depth = scsi_change_queue_depth, From patchwork Thu Oct 7 21:18:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543497 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65CA1C433FE for ; Thu, 7 Oct 2021 21:20:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B520610A5 for ; Thu, 7 Oct 2021 21:20:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233949AbhJGVWD (ORCPT ); Thu, 7 Oct 2021 17:22:03 -0400 Received: from mail-pj1-f49.google.com ([209.85.216.49]:52011 "EHLO mail-pj1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235301AbhJGVWB (ORCPT ); Thu, 7 Oct 2021 17:22:01 -0400 Received: by mail-pj1-f49.google.com with SMTP id kk10so5924461pjb.1 for ; Thu, 07 Oct 2021 14:20:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/7aGY+un33PINJA1R2SVKhbBbMusgH29CstEqhnoTSU=; b=oI5akhiXVX06ureA6fXAwPhWDAGZ/UjHCiRsFV8Vgb8IWdj6jcbo1AAbEBbXAQCLzx YNJHkfPhhekRwTqBnKJAFFev6HgfOTLCSbMkdQQvhODU28+yAb2JURLS2jsfZb/mUh+n Y7FQpdxBfa6BLzVSvRY1+jaddB4VP4vRcujj2SKzpTuDfKtNFXQ/kWOKoi1VF4qGsUpg JhWK3kVtwYWRtbhSK+/Xe3/mBzaB69ecOUWYtY/Bi1sMXN9FqS+UsH5Avt1l0+w7YeSP oKkaO5raX3cqsibHyVLHBQszMqcR0aZlcjHpT0KKv5bAgQlWs6t5Cb0tjhgGsfDXf67K ul/Q== X-Gm-Message-State: AOAM530kt570/ezLCYYf903Sm/4cpu3FstLSWEdayzWP2EkFw2aLfw1t V0512qqLxpele93hYtcmOnA= X-Google-Smtp-Source: ABdhPJzPl9TUu+F+MulWr8t8Suf5XYymMfnOrNsA5NAV4tD2p321ufpKRLPvgBh2m5M6i+C91/XUAg== X-Received: by 2002:a17:902:9689:b0:138:d2ac:44f with SMTP id n9-20020a170902968900b00138d2ac044fmr5945779plp.85.1633641606723; Thu, 07 Oct 2021 14:20:06 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:06 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Kashyap Desai , Sumit Saxena , Shivasharan S , "James E.J. Bottomley" Subject: [PATCH v2 28/46] scsi: megaraid: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:34 -0700 Message-Id: <20211007211852.256007-29-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/megaraid/megaraid_mbox.c | 29 ++++++++++++++++----- drivers/scsi/megaraid/megaraid_sas_base.c | 31 +++++++++++++++-------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index d20c2e4ee793..1262bb4b225f 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c @@ -305,20 +305,37 @@ static struct pci_driver megaraid_pci_driver = { static DEVICE_ATTR_ADMIN_RO(megaraid_mbox_app_hndl); // Host template initializer for megaraid mbox sysfs device attributes -static struct device_attribute *megaraid_shost_attrs[] = { - &dev_attr_megaraid_mbox_app_hndl, +static struct attribute *megaraid_shost_attrs[] = { + &dev_attr_megaraid_mbox_app_hndl.attr, NULL, }; +static const struct attribute_group megaraid_shost_attr_group = { + .attrs = megaraid_shost_attrs +}; + +static const struct attribute_group *megaraid_shost_groups[] = { + &megaraid_shost_attr_group, + NULL +}; static DEVICE_ATTR_ADMIN_RO(megaraid_mbox_ld); // Host template initializer for megaraid mbox sysfs device attributes -static struct device_attribute *megaraid_sdev_attrs[] = { - &dev_attr_megaraid_mbox_ld, +static struct attribute *megaraid_sdev_attrs[] = { + &dev_attr_megaraid_mbox_ld.attr, NULL, }; +static const struct attribute_group megaraid_sdev_attr_group = { + .attrs = megaraid_sdev_attrs +}; + +static const struct attribute_group *megaraid_sdev_attr_groups[] = { + &megaraid_sdev_attr_group, + NULL +}; + /* * Scsi host template for megaraid unified driver */ @@ -331,8 +348,8 @@ static struct scsi_host_template megaraid_template_g = { .eh_host_reset_handler = megaraid_reset_handler, .change_queue_depth = scsi_change_queue_depth, .no_write_same = 1, - .sdev_attrs = megaraid_sdev_attrs, - .shost_attrs = megaraid_shost_attrs, + .sdev_groups = megaraid_sdev_attr_groups, + .shost_groups = megaraid_shost_groups, }; diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index e4298bf4a482..c68d504ac31e 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -3481,19 +3481,28 @@ static DEVICE_ATTR_RW(enable_sdev_max_qd); static DEVICE_ATTR_RO(dump_system_regs); static DEVICE_ATTR_RO(raid_map_id); -static struct device_attribute *megaraid_host_attrs[] = { - &dev_attr_fw_crash_buffer_size, - &dev_attr_fw_crash_buffer, - &dev_attr_fw_crash_state, - &dev_attr_page_size, - &dev_attr_ldio_outstanding, - &dev_attr_fw_cmds_outstanding, - &dev_attr_enable_sdev_max_qd, - &dev_attr_dump_system_regs, - &dev_attr_raid_map_id, +static struct attribute *megaraid_host_attrs[] = { + &dev_attr_fw_crash_buffer_size.attr, + &dev_attr_fw_crash_buffer.attr, + &dev_attr_fw_crash_state.attr, + &dev_attr_page_size.attr, + &dev_attr_ldio_outstanding.attr, + &dev_attr_fw_cmds_outstanding.attr, + &dev_attr_enable_sdev_max_qd.attr, + &dev_attr_dump_system_regs.attr, + &dev_attr_raid_map_id.attr, NULL, }; +static const struct attribute_group megaraid_host_attr_group = { + .attrs = megaraid_host_attrs, +}; + +static const struct attribute_group *megaraid_host_attr_groups[] = { + &megaraid_host_attr_group, + NULL +}; + /* * Scsi host template for megaraid_sas driver */ @@ -3510,7 +3519,7 @@ static struct scsi_host_template megasas_template = { .eh_abort_handler = megasas_task_abort, .eh_host_reset_handler = megasas_reset_bus_host, .eh_timed_out = megasas_reset_timer, - .shost_attrs = megaraid_host_attrs, + .shost_groups = megaraid_host_attr_groups, .bios_param = megasas_bios_param, .map_queues = megasas_map_queues, .mq_poll = megasas_blk_mq_poll, From patchwork Thu Oct 7 21:18:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543499 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 380E7C433EF for ; Thu, 7 Oct 2021 21:20:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1DC5D610A0 for ; Thu, 7 Oct 2021 21:20:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240816AbhJGVWF (ORCPT ); Thu, 7 Oct 2021 17:22:05 -0400 Received: from mail-pj1-f45.google.com ([209.85.216.45]:54937 "EHLO mail-pj1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240366AbhJGVWC (ORCPT ); Thu, 7 Oct 2021 17:22:02 -0400 Received: by mail-pj1-f45.google.com with SMTP id np13so5900137pjb.4 for ; Thu, 07 Oct 2021 14:20:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b0888WQQAG6E62FRWXYXL4SaAalO4wGt5IIAyVnanHY=; b=URNsA0rkHvGFQAK4xxV5Fg4Xc1YCv1DRwrOf7OFHzKNmIQS5sGzyvkYCeDwf6IWgfr euHLVrllk5unffCf2X5y80atKeivFG1cisDzJeGz4wLvBq9BwvTrl2S1eSCJQi0IYJv6 aqZmrwHPFfIN8+TmoXEUaZI37by/VMlmo/amzHvDZywKNDfiIy3tEcuBuysA63sWXboU EnoRlRXmgHSXnz/JaZ07ASY/JK3ieSjiP8HsHPXuBhmw5n/JIIt+mbRkF3CUvkoZvvzE 3P6J2ex3i2NVUHYV6asCBD/ee2ncK3vX9y4dBCiakrDKkEmMG31ii1TFCTbTbI0PAWF8 CiGA== X-Gm-Message-State: AOAM5301MaLH3586nQ7u3Gr7UhP4cvUZssZ3/A/XVDOcPy8eq49nDI2F t97soe6bc5e+yyuMpLc/Tge1EGCGDcar8A== X-Google-Smtp-Source: ABdhPJzGQtcoI5IEt3nQ+YqyaHXMdvuJ1K+f03dU+CKeRSEIL8mOYrhBZf1LuPya5ZcPkCy4XEvPkQ== X-Received: by 2002:a17:90b:282:: with SMTP id az2mr7413869pjb.215.1633641608485; Thu, 07 Oct 2021 14:20:08 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:08 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , "James E.J. Bottomley" Subject: [PATCH v2 29/46] scsi: mpt3sas: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:35 -0700 Message-Id: <20211007211852.256007-30-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 84 +++++++++++++++++----------- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 +-- 3 files changed, 57 insertions(+), 39 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h index f87c0911f66a..cf3fbc4adc6d 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -1939,8 +1939,8 @@ mpt3sas_config_update_driver_trigger_pg4(struct MPT3SAS_ADAPTER *ioc, struct SL_WH_MPI_TRIGGERS_T *mpi_tg, bool set); /* ctl shared API */ -extern struct device_attribute *mpt3sas_host_attrs[]; -extern struct device_attribute *mpt3sas_dev_attrs[]; +extern const struct attribute_group *mpt3sas_host_attr_groups[]; +extern const struct attribute_group *mpt3sas_dev_attr_groups[]; void mpt3sas_ctl_init(ushort hbas_to_enumerate); void mpt3sas_ctl_exit(ushort hbas_to_enumerate); u8 mpt3sas_ctl_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c index 770b241d7bb2..2e6f73f5b9a1 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c @@ -3842,37 +3842,46 @@ enable_sdev_max_qd_store(struct device *cdev, } static DEVICE_ATTR_RW(enable_sdev_max_qd); -struct device_attribute *mpt3sas_host_attrs[] = { - &dev_attr_version_fw, - &dev_attr_version_bios, - &dev_attr_version_mpi, - &dev_attr_version_product, - &dev_attr_version_nvdata_persistent, - &dev_attr_version_nvdata_default, - &dev_attr_board_name, - &dev_attr_board_assembly, - &dev_attr_board_tracer, - &dev_attr_io_delay, - &dev_attr_device_delay, - &dev_attr_logging_level, - &dev_attr_fwfault_debug, - &dev_attr_fw_queue_depth, - &dev_attr_host_sas_address, - &dev_attr_ioc_reset_count, - &dev_attr_host_trace_buffer_size, - &dev_attr_host_trace_buffer, - &dev_attr_host_trace_buffer_enable, - &dev_attr_reply_queue_count, - &dev_attr_diag_trigger_master, - &dev_attr_diag_trigger_event, - &dev_attr_diag_trigger_scsi, - &dev_attr_diag_trigger_mpi, - &dev_attr_drv_support_bitmap, - &dev_attr_BRM_status, - &dev_attr_enable_sdev_max_qd, +static struct attribute *mpt3sas_host_attrs[] = { + &dev_attr_version_fw.attr, + &dev_attr_version_bios.attr, + &dev_attr_version_mpi.attr, + &dev_attr_version_product.attr, + &dev_attr_version_nvdata_persistent.attr, + &dev_attr_version_nvdata_default.attr, + &dev_attr_board_name.attr, + &dev_attr_board_assembly.attr, + &dev_attr_board_tracer.attr, + &dev_attr_io_delay.attr, + &dev_attr_device_delay.attr, + &dev_attr_logging_level.attr, + &dev_attr_fwfault_debug.attr, + &dev_attr_fw_queue_depth.attr, + &dev_attr_host_sas_address.attr, + &dev_attr_ioc_reset_count.attr, + &dev_attr_host_trace_buffer_size.attr, + &dev_attr_host_trace_buffer.attr, + &dev_attr_host_trace_buffer_enable.attr, + &dev_attr_reply_queue_count.attr, + &dev_attr_diag_trigger_master.attr, + &dev_attr_diag_trigger_event.attr, + &dev_attr_diag_trigger_scsi.attr, + &dev_attr_diag_trigger_mpi.attr, + &dev_attr_drv_support_bitmap.attr, + &dev_attr_BRM_status.attr, + &dev_attr_enable_sdev_max_qd.attr, NULL, }; +static const struct attribute_group mpt3sas_host_attr_group = { + .attrs = mpt3sas_host_attrs +}; + +const struct attribute_group *mpt3sas_host_attr_groups[] = { + &mpt3sas_host_attr_group, + NULL +}; + /* device attributes */ /** @@ -3976,14 +3985,23 @@ sas_ncq_prio_enable_store(struct device *dev, } static DEVICE_ATTR_RW(sas_ncq_prio_enable); -struct device_attribute *mpt3sas_dev_attrs[] = { - &dev_attr_sas_address, - &dev_attr_sas_device_handle, - &dev_attr_sas_ncq_prio_supported, - &dev_attr_sas_ncq_prio_enable, +struct attribute *mpt3sas_dev_attrs[] = { + &dev_attr_sas_address.attr, + &dev_attr_sas_device_handle.attr, + &dev_attr_sas_ncq_prio_supported.attr, + &dev_attr_sas_ncq_prio_enable.attr, NULL, }; +static const struct attribute_group mpt3sas_dev_attr_group = { + .attrs = mpt3sas_dev_attrs +}; + +const struct attribute_group *mpt3sas_dev_attr_groups[] = { + &mpt3sas_dev_attr_group, + NULL +}; + /* file operations table for mpt3ctl device */ static const struct file_operations ctl_fops = { .owner = THIS_MODULE, diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 2f82b1e629af..e79ace9b2bd9 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -11876,8 +11876,8 @@ static struct scsi_host_template mpt2sas_driver_template = { .sg_tablesize = MPT2SAS_SG_DEPTH, .max_sectors = 32767, .cmd_per_lun = 7, - .shost_attrs = mpt3sas_host_attrs, - .sdev_attrs = mpt3sas_dev_attrs, + .shost_groups = mpt3sas_host_attr_groups, + .sdev_groups = mpt3sas_dev_attr_groups, .track_queue_depth = 1, .cmd_size = sizeof(struct scsiio_tracker), }; @@ -11915,8 +11915,8 @@ static struct scsi_host_template mpt3sas_driver_template = { .max_sectors = 32767, .max_segment_size = 0xffffffff, .cmd_per_lun = 7, - .shost_attrs = mpt3sas_host_attrs, - .sdev_attrs = mpt3sas_dev_attrs, + .shost_groups = mpt3sas_host_attr_groups, + .sdev_groups = mpt3sas_dev_attr_groups, .track_queue_depth = 1, .cmd_size = sizeof(struct scsiio_tracker), .map_queues = scsih_map_queues, From patchwork Thu Oct 7 21:18:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543501 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2AF6C433EF for ; Thu, 7 Oct 2021 21:20:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6C41610A5 for ; Thu, 7 Oct 2021 21:20:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240742AbhJGVWP (ORCPT ); Thu, 7 Oct 2021 17:22:15 -0400 Received: from mail-pj1-f44.google.com ([209.85.216.44]:45010 "EHLO mail-pj1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241012AbhJGVWK (ORCPT ); Thu, 7 Oct 2021 17:22:10 -0400 Received: by mail-pj1-f44.google.com with SMTP id oa12-20020a17090b1bcc00b0019f715462a8so6194358pjb.3 for ; Thu, 07 Oct 2021 14:20:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ON3CAl199Wqr8BQIEBjX4WfHt1Cnlq6QAbdeBW4d6B8=; b=oQxjIb11YdY3tmhFsA0FRjlcOHGTdOpJqEEowBhgZSW6lpLZrMK7TWN06eripB0i/c g4T9NgSqGX8VVnae3erUevOp0SlrNN+Fz2S/oU8ELGd5u/qJee7EhNF6wgJzhJMsrq3m yBzvjxaXLjiTYMHO+Vm0gPyFE9wGVvsk8aqSbZM5S4kWMQKGRjTZABD004mRnsbx2609 3QsGyOoiunJLXGwxPXSYih3ECzPxe5014ND7zvnuP/kMMbOpbCvs6lT5+cSINGh30qub h2znZt/doTT3sBjHC/EMSdIbWu8C3lpYmqoS9hiMFkdVN1gtqDTetpcpCUQwq4wfq5pQ tSPA== X-Gm-Message-State: AOAM532i0qQPJih5ZeaWqvmpQYtfBs/i40Iqtt60Sbp/p9os/FNkBQt6 +gmwJZabr53Oyc/Jjn77eTQ= X-Google-Smtp-Source: ABdhPJzu9eKP0eP2emenoROQ6WfKaJ4BMcrJ5sVs6n8IVggcP/gyTbSZIe9LUDSY8OwaF0y8zR5emw== X-Received: by 2002:a17:90b:33c8:: with SMTP id lk8mr7451293pjb.208.1633641615440; Thu, 07 Oct 2021 14:20:15 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:14 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , "James E.J. Bottomley" , Jason Yan , Zhen Lei , Yufen Yu Subject: [PATCH v2 30/46] scsi: mvsas: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:36 -0700 Message-Id: <20211007211852.256007-31-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/mvsas/mv_init.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index f18dd9703595..34fe54a6050f 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c @@ -25,7 +25,7 @@ static const struct mvs_chip_info mvs_chips[] = { [chip_1320] = { 2, 4, 0x800, 17, 64, 8, 9, &mvs_94xx_dispatch, }, }; -static struct device_attribute *mvst_host_attrs[]; +static const struct attribute_group *mvst_host_attr_groups[]; #define SOC_SAS_NUM 2 @@ -52,7 +52,7 @@ static struct scsi_host_template mvs_sht = { #ifdef CONFIG_COMPAT .compat_ioctl = sas_ioctl, #endif - .shost_attrs = mvst_host_attrs, + .shost_groups = mvst_host_attr_groups, .track_queue_depth = 1, }; @@ -773,12 +773,21 @@ static void __exit mvs_exit(void) sas_release_transport(mvs_stt); } -static struct device_attribute *mvst_host_attrs[] = { - &dev_attr_driver_version, - &dev_attr_interrupt_coalescing, +static struct attribute *mvst_host_attrs[] = { + &dev_attr_driver_version.attr, + &dev_attr_interrupt_coalescing.attr, NULL, }; +static const struct attribute_group mvst_host_attr_group = { + .attrs = mvst_host_attrs +}; + +static const struct attribute_group *mvst_host_attr_groups[] = { + &mvst_host_attr_group, + NULL +}; + module_init(mvs_init); module_exit(mvs_exit); From patchwork Thu Oct 7 21:18:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543507 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0465C433FE for ; Thu, 7 Oct 2021 21:20:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C330461139 for ; Thu, 7 Oct 2021 21:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240950AbhJGVWQ (ORCPT ); Thu, 7 Oct 2021 17:22:16 -0400 Received: from mail-pj1-f42.google.com ([209.85.216.42]:39769 "EHLO mail-pj1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240906AbhJGVWL (ORCPT ); Thu, 7 Oct 2021 17:22:11 -0400 Received: by mail-pj1-f42.google.com with SMTP id ls18-20020a17090b351200b001a00250584aso7433206pjb.4 for ; Thu, 07 Oct 2021 14:20:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z1F7m2PlYrZRX9+kpVb/8z03qDjC0pd4g/2ZCvZjyRQ=; b=Um50+o51rQ+k6axfzjy5cgpleWDTIZ5vMLGCCccxd7xaodxdXHIBIKLsAWhuENDfa2 J/tBwfKdBBtPShk0ltf4Rsn8aMvzqNVGctpg2SxrMz17z6BviiL60xD2r06oJ4FP/Yx0 U8dcWFu2c83cWID1OkbeWCXqJsA//KaDffvkH4Szv0GEvDZB7X8nk2AGMxJMNzpNVuYg 8B9M3jKsVSpS6u31nGgvVea4RvTFua6Wd7hxu56biYyWAwPB+6nilETBPh6yZvctLMQI vfzDhLSrFONiHXff2yTCjRpIIyj729mxJ2ERBeI3GNFsU1+ECjH1hZ5RQvT7wCHOMNN0 wlPg== X-Gm-Message-State: AOAM530sRFm3J2n160582PB0He81zcm++MojSMXhYq5Nn1VUztFaut0g GmId3XMm7U0Tlfx8q1emRms= X-Google-Smtp-Source: ABdhPJwHsN3eAh8g3fTsussLtl1S5x1tNTSp8iXfoMKFdFs8wRb+We90ZlhS9NerWYokTUW3sMW0vQ== X-Received: by 2002:a17:90a:d48c:: with SMTP id s12mr8076971pju.145.1633641616842; Thu, 07 Oct 2021 14:20:16 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:16 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Hannes Reinecke , "James E.J. Bottomley" Subject: [PATCH v2 31/46] scsi: myrb: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:37 -0700 Message-Id: <20211007211852.256007-32-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/myrb.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c index a4a88323e020..0b9bd540db3b 100644 --- a/drivers/scsi/myrb.c +++ b/drivers/scsi/myrb.c @@ -2182,22 +2182,40 @@ static ssize_t flush_cache_store(struct device *dev, } static DEVICE_ATTR_WO(flush_cache); -static struct device_attribute *myrb_sdev_attrs[] = { - &dev_attr_rebuild, - &dev_attr_consistency_check, - &dev_attr_raid_state, - &dev_attr_raid_level, +static struct attribute *myrb_sdev_attrs[] = { + &dev_attr_rebuild.attr, + &dev_attr_consistency_check.attr, + &dev_attr_raid_state.attr, + &dev_attr_raid_level.attr, NULL, }; -static struct device_attribute *myrb_shost_attrs[] = { - &dev_attr_ctlr_num, - &dev_attr_model, - &dev_attr_firmware, - &dev_attr_flush_cache, +static const struct attribute_group myrb_sdev_attr_group = { + .attrs = myrb_sdev_attrs +}; + +static const struct attribute_group *myrb_sdev_attr_groups[] = { + &myrb_sdev_attr_group, + NULL +}; + +static struct attribute *myrb_shost_attrs[] = { + &dev_attr_ctlr_num.attr, + &dev_attr_model.attr, + &dev_attr_firmware.attr, + &dev_attr_flush_cache.attr, NULL, }; +static const struct attribute_group myrb_shost_attr_group = { + .attrs = myrb_shost_attrs +}; + +static const struct attribute_group *myrb_shost_groups[] = { + &myrb_shost_attr_group, + NULL +}; + static struct scsi_host_template myrb_template = { .module = THIS_MODULE, .name = "DAC960", @@ -2209,8 +2227,8 @@ static struct scsi_host_template myrb_template = { .slave_destroy = myrb_slave_destroy, .bios_param = myrb_biosparam, .cmd_size = sizeof(struct myrb_cmdblk), - .shost_attrs = myrb_shost_attrs, - .sdev_attrs = myrb_sdev_attrs, + .shost_groups = myrb_shost_groups, + .sdev_groups = myrb_sdev_attr_groups, .this_id = -1, }; From patchwork Thu Oct 7 21:18:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87B22C433F5 for ; Thu, 7 Oct 2021 21:20:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 72D01610A0 for ; Thu, 7 Oct 2021 21:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240868AbhJGVWP (ORCPT ); Thu, 7 Oct 2021 17:22:15 -0400 Received: from mail-pg1-f174.google.com ([209.85.215.174]:36787 "EHLO mail-pg1-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233882AbhJGVWM (ORCPT ); Thu, 7 Oct 2021 17:22:12 -0400 Received: by mail-pg1-f174.google.com with SMTP id 75so1048147pga.3 for ; Thu, 07 Oct 2021 14:20:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wEFBvcbaPpVGNTliLb3FLEV71WXDnWSku/Og5SVOWmU=; b=7NlnUYQdcj2lQtuCV3gT9uugUtKojamTUjxtbrq3ZMZ78eyXyOW/G5K19db8yM48GR p4MeY/5nWjDrd1w8SK0WNcpdf5IHYAL03THuVilbxLtRQ2X9MwpVhY5Z9Hs4GlCSvUW/ mLJ1Q8rTwy5EkWV6WqfnNCBw8YZLizKr1Rur3qayy3gnPYYME3nYLUb7HvCUjYn7YcL3 eVvdbrZJPDAxMxGin54LTnEsw4eCWZNBiUJCMm4bA5w+ywTbpixkTL7pxTn9ya7rMMoy dBukuEpGI35wAhTp2/4kbtXwaFlj69ywWdicLhHDIV6dhM7m7r9QnyG4pGOzfgiI+ULR CJew== X-Gm-Message-State: AOAM531ElipD0VFiFfnIBFiR2DFq0jXe75PJs7TeC5/hd7k8ldjg3N80 S95oTZvygpB8crZ+ZHS9GEs= X-Google-Smtp-Source: ABdhPJy90AUuvcOaeDZGLyhaSFUes1vkIDJMjolKraUZ9CMF+ZkZ4HSF6uZlDmqyJ2EQYUsTo0BJlA== X-Received: by 2002:a05:6a00:188b:b0:44c:70a8:cf4 with SMTP id x11-20020a056a00188b00b0044c70a80cf4mr6262822pfh.85.1633641618318; Thu, 07 Oct 2021 14:20:18 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:17 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Hannes Reinecke , "James E.J. Bottomley" Subject: [PATCH v2 32/46] scsi: myrs: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:38 -0700 Message-Id: <20211007211852.256007-33-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/myrs.c | 54 ++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c index 07f274afd7e5..c4a897939729 100644 --- a/drivers/scsi/myrs.c +++ b/drivers/scsi/myrs.c @@ -1286,14 +1286,23 @@ static ssize_t consistency_check_store(struct device *dev, } static DEVICE_ATTR_RW(consistency_check); -static struct device_attribute *myrs_sdev_attrs[] = { - &dev_attr_consistency_check, - &dev_attr_rebuild, - &dev_attr_raid_state, - &dev_attr_raid_level, +static struct attribute *myrs_sdev_attrs[] = { + &dev_attr_consistency_check.attr, + &dev_attr_rebuild.attr, + &dev_attr_raid_state.attr, + &dev_attr_raid_level.attr, NULL, }; +static const struct attribute_group myrs_sdev_attr_group = { + .attrs = myrs_sdev_attrs +}; + +static const struct attribute_group *myrs_sdev_attr_groups[] = { + &myrs_sdev_attr_group, + NULL +}; + static ssize_t serial_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1510,20 +1519,29 @@ static ssize_t disable_enclosure_messages_store(struct device *dev, } static DEVICE_ATTR_RW(disable_enclosure_messages); -static struct device_attribute *myrs_shost_attrs[] = { - &dev_attr_serial, - &dev_attr_ctlr_num, - &dev_attr_processor, - &dev_attr_model, - &dev_attr_ctlr_type, - &dev_attr_cache_size, - &dev_attr_firmware, - &dev_attr_discovery, - &dev_attr_flush_cache, - &dev_attr_disable_enclosure_messages, +static struct attribute *myrs_shost_attrs[] = { + &dev_attr_serial.attr, + &dev_attr_ctlr_num.attr, + &dev_attr_processor.attr, + &dev_attr_model.attr, + &dev_attr_ctlr_type.attr, + &dev_attr_cache_size.attr, + &dev_attr_firmware.attr, + &dev_attr_discovery.attr, + &dev_attr_flush_cache.attr, + &dev_attr_disable_enclosure_messages.attr, NULL, }; +static const struct attribute_group myrs_shost_attr_group = { + .attrs = myrs_shost_attrs +}; + +static const struct attribute_group *myrs_shost_groups[] = { + &myrs_shost_attr_group, + NULL +}; + /* * SCSI midlayer interface */ @@ -1923,8 +1941,8 @@ static struct scsi_host_template myrs_template = { .slave_configure = myrs_slave_configure, .slave_destroy = myrs_slave_destroy, .cmd_size = sizeof(struct myrs_cmdblk), - .shost_attrs = myrs_shost_attrs, - .sdev_attrs = myrs_sdev_attrs, + .shost_groups = myrs_shost_groups, + .sdev_groups = myrs_sdev_attr_groups, .this_id = -1, }; From patchwork Thu Oct 7 21:18:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543505 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 548E8C4332F for ; Thu, 7 Oct 2021 21:20:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D9CD61130 for ; Thu, 7 Oct 2021 21:20:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240802AbhJGVWQ (ORCPT ); Thu, 7 Oct 2021 17:22:16 -0400 Received: from mail-pg1-f181.google.com ([209.85.215.181]:39680 "EHLO mail-pg1-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240366AbhJGVWO (ORCPT ); Thu, 7 Oct 2021 17:22:14 -0400 Received: by mail-pg1-f181.google.com with SMTP id g184so1035956pgc.6 for ; Thu, 07 Oct 2021 14:20:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N1AJLD3n469rpGWe1gMcw0PT8DJOqxM5sBHdkCfKoKI=; b=uFkdeCLd/tg8jh509xFWRtsoMyg6Qar95fj70Gaycn/1k2RSoIcWCCn9h4cxPyEPRY 19g699wKvyGHDlhKKIJ0NXC99x8UjVs9SKZGZRdVURHIcLMMvT6Mev1pJiWoa1yzfmtG m/nOM67VzzNCtsBEiaEF/LtUPOR6sbLnJhl1X2XENvnq62gMsmDPDw3Cc7+HcXBx6YSM 3DlB4yM3W3G4ApOaba2fg//3/8LFKh8DPJOuuLkKdCjccFvqUOM4W2sTuwtBxHB6EaKS q+n1QKE2LLQQAiUvMqjX4millit8r+lGKwv29MgR/ox15Lv1yeN04SGhBPSEm2Uu663k KUeg== X-Gm-Message-State: AOAM5306VndBWR7Xza+G0FztvC0jXYvPgD4hSSej5zuFfhyyOO6iO8Wy +n2Tli8W+9+lL3nJTudOOOU78dRKHJiDLg== X-Google-Smtp-Source: ABdhPJw9fxxnyX0FKseTpJoHLkiCSRG2K/g+U7ZFw9ZDT5Vw7agOXsSrj5WqlYX8b1m1srX/hxOmbw== X-Received: by 2002:a62:3287:0:b0:439:bfec:8374 with SMTP id y129-20020a623287000000b00439bfec8374mr6296288pfy.15.1633641619687; Thu, 07 Oct 2021 14:20:19 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:19 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , "James E.J. Bottomley" Subject: [PATCH v2 33/46] scsi: ncr53c8xx: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:39 -0700 Message-Id: <20211007211852.256007-34-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/ncr53c8xx.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index 2b8c6fa5e775..a3e397ce9d24 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c @@ -8039,8 +8039,17 @@ 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 +}; + +static const struct attribute_group ncr53c8xx_host_attr_group = { + .attrs = ncr53c8xx_host_attrs +}; + +static const struct attribute_group *ncr53c8xx_host_attr_groups[] = { + &ncr53c8xx_host_attr_group, NULL }; @@ -8085,8 +8094,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_attr_groups; tpnt->queuecommand = ncr53c8xx_queue_command; tpnt->slave_configure = ncr53c8xx_slave_configure; From patchwork Thu Oct 7 21:18:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543509 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF364C433F5 for ; Thu, 7 Oct 2021 21:20:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D657E610A0 for ; Thu, 7 Oct 2021 21:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240809AbhJGVWV (ORCPT ); Thu, 7 Oct 2021 17:22:21 -0400 Received: from mail-pg1-f169.google.com ([209.85.215.169]:40663 "EHLO mail-pg1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240366AbhJGVWU (ORCPT ); Thu, 7 Oct 2021 17:22:20 -0400 Received: by mail-pg1-f169.google.com with SMTP id h3so1035226pgb.7 for ; Thu, 07 Oct 2021 14:20:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TFW3fCSqiu4zDVSFNIgjTISJtOE+9vyaQ1ogTut5TTE=; b=I0NRnCCM/qOAGG7cFG1h/JArWY1xyB9oL96bX6fUs5KQwQttUyUuMFcIAy64Zg4e43 6eOeFR9nyB762guR4iOg7ka3Wlti2TBj2LaVkv8ThEf0RMmguhbtrmAdWaJC1O4Qpcq0 Cdj8/kZjupHZJcbaPgdVRRfbWMvj8BA7iAF4T2YLdlNDfs9F7yorROyUA+BVrkl9+Ra/ rbyKApnRftfV8q2PdDwunFRoDsB79QPm7cX19ftKxq8rFlK+0MsGHFiqXY6ZGbVwaQoi uax2S5vckkQPgOBVo+PS5KZ9l9+lWiWy/5GO1ekkafUa4DlwhBE41f1ecbEePeEbxnqw UqSg== X-Gm-Message-State: AOAM530/iOrvt4HoZP8j5XRW85GElH01Xf9LOx2kaXoEiQ1kG0Xz5kkx dGkYy/OuaRiJMqRxeyV2fKM= X-Google-Smtp-Source: ABdhPJy85nhRPyS+btlTsUeFFV/+VUXJ2Oh76notFUTMij4fQhvJEhxkrkw2RGBM/5NP5qOTJRt2eQ== X-Received: by 2002:a62:1ac3:0:b0:44b:85d0:5a98 with SMTP id a186-20020a621ac3000000b0044b85d05a98mr6341224pfa.18.1633641626479; Thu, 07 Oct 2021 14:20:26 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:26 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , "James E.J. Bottomley" Subject: [PATCH v2 34/46] scsi: sym53c500_cs: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:40 -0700 Message-Id: <20211007211852.256007-35-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/pcmcia/sym53c500_cs.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index a366ff1a3959..e2d485e0e474 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c @@ -652,11 +652,20 @@ static struct device_attribute SYM53C500_pio_attr = { .store = SYM53C500_store_pio, }; -static struct device_attribute *SYM53C500_shost_attrs[] = { - &SYM53C500_pio_attr, +static struct attribute *SYM53C500_shost_attrs[] = { + &SYM53C500_pio_attr.attr, NULL, }; +static const struct attribute_group SYM53C500_shost_attr_group = { + .attrs = SYM53C500_shost_attrs +}; + +static const struct attribute_group *SYM53C500_shost_groups[] = { + &SYM53C500_shost_attr_group, + NULL +}; + /* * scsi_host_template initializer */ @@ -671,7 +680,7 @@ static struct scsi_host_template sym53c500_driver_template = { .can_queue = 1, .this_id = 7, .sg_tablesize = 32, - .shost_attrs = SYM53C500_shost_attrs + .shost_groups = SYM53C500_shost_groups }; static int SYM53C500_config_check(struct pcmcia_device *p_dev, void *priv_data) From patchwork Thu Oct 7 21:18:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543511 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A464C433EF for ; Thu, 7 Oct 2021 21:20:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8338161077 for ; Thu, 7 Oct 2021 21:20:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240837AbhJGVWX (ORCPT ); Thu, 7 Oct 2021 17:22:23 -0400 Received: from mail-pg1-f175.google.com ([209.85.215.175]:43593 "EHLO mail-pg1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240906AbhJGVWW (ORCPT ); Thu, 7 Oct 2021 17:22:22 -0400 Received: by mail-pg1-f175.google.com with SMTP id r2so1023953pgl.10 for ; Thu, 07 Oct 2021 14:20:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dSqdlEd51D1G13fXTl3WMtijrgfWuGIxBZO2N1mdIGA=; b=eqfhf/x7e4l493rfq8i9Xha+gSv/6OFBbHOGd6L65qNNvaA9RapVKxUzIX4k5F6fBJ NqPQp+ArbKqa4OLFityI+jb36u1EO9Pmpo55x5Zexbs1Qg5Id55Dp14ZLXCAAPdEqfZA p6ThF2lRVC4HYqz57ib5rWSrDgSMcQUKTHP+VUUUNHOYr85qmUehWwTxD4SWw1+NHuMU YqpOhTeDk4sB46s54nqIbKnuueiyX3y5XaIMQImwakl0fCZIPsuN5wvRu3+R6ZWWi7js QwBGkefNroAXci3pZEUc0rF3CjLoUVRkXDgoWgikNkVnb/sYNJl4oUiETHmlXOC91702 h6UA== X-Gm-Message-State: AOAM532y0lud2b1dTbeMkI7/KpExWi2zhuMAeXnHfB9ah7iRe+8ctdpS bLZQ7a7KohuYZHFvWnQlThE= X-Google-Smtp-Source: ABdhPJxV/zcX1PnVy2t3BfirfWCps36ebvWotO3AXc0xcdNB5S/Q7Z7yT5VxIenp3WEdNqdwbvp8/g== X-Received: by 2002:aa7:949c:0:b0:44c:a0df:2c7f with SMTP id z28-20020aa7949c000000b0044ca0df2c7fmr6642491pfk.34.1633641628080; Thu, 07 Oct 2021 14:20:28 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:27 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Jack Wang , "James E.J. Bottomley" Subject: [PATCH v2 35/46] scsi: pm8001: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:41 -0700 Message-Id: <20211007211852.256007-36-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/pm8001/pm8001_ctl.c | 64 +++++++++++++++++-------------- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/scsi/pm8001/pm8001_sas.h | 2 +- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c index b25e447aa3bd..916a95211b03 100644 --- a/drivers/scsi/pm8001/pm8001_ctl.c +++ b/drivers/scsi/pm8001/pm8001_ctl.c @@ -1002,34 +1002,42 @@ static ssize_t ctl_iop1_count_show(struct device *cdev, } static DEVICE_ATTR_RO(ctl_iop1_count); -struct device_attribute *pm8001_host_attrs[] = { - &dev_attr_interface_rev, - &dev_attr_controller_fatal_error, - &dev_attr_fw_version, - &dev_attr_update_fw, - &dev_attr_aap_log, - &dev_attr_iop_log, - &dev_attr_fatal_log, - &dev_attr_non_fatal_log, - &dev_attr_non_fatal_count, - &dev_attr_gsm_log, - &dev_attr_max_out_io, - &dev_attr_max_devices, - &dev_attr_max_sg_list, - &dev_attr_sas_spec_support, - &dev_attr_logging_level, - &dev_attr_event_log_size, - &dev_attr_host_sas_address, - &dev_attr_bios_version, - &dev_attr_ib_log, - &dev_attr_ob_log, - &dev_attr_ila_version, - &dev_attr_inc_fw_ver, - &dev_attr_ctl_mpi_state, - &dev_attr_ctl_hmi_error, - &dev_attr_ctl_raae_count, - &dev_attr_ctl_iop0_count, - &dev_attr_ctl_iop1_count, +static struct attribute *pm8001_host_attrs[] = { + &dev_attr_interface_rev.attr, + &dev_attr_controller_fatal_error.attr, + &dev_attr_fw_version.attr, + &dev_attr_update_fw.attr, + &dev_attr_aap_log.attr, + &dev_attr_iop_log.attr, + &dev_attr_fatal_log.attr, + &dev_attr_non_fatal_log.attr, + &dev_attr_non_fatal_count.attr, + &dev_attr_gsm_log.attr, + &dev_attr_max_out_io.attr, + &dev_attr_max_devices.attr, + &dev_attr_max_sg_list.attr, + &dev_attr_sas_spec_support.attr, + &dev_attr_logging_level.attr, + &dev_attr_event_log_size.attr, + &dev_attr_host_sas_address.attr, + &dev_attr_bios_version.attr, + &dev_attr_ib_log.attr, + &dev_attr_ob_log.attr, + &dev_attr_ila_version.attr, + &dev_attr_inc_fw_ver.attr, + &dev_attr_ctl_mpi_state.attr, + &dev_attr_ctl_hmi_error.attr, + &dev_attr_ctl_raae_count.attr, + &dev_attr_ctl_iop0_count.attr, + &dev_attr_ctl_iop1_count.attr, NULL, }; +static const struct attribute_group pm8001_host_attr_group = { + .attrs = pm8001_host_attrs +}; + +const struct attribute_group *pm8001_host_attr_groups[] = { + &pm8001_host_attr_group, + NULL +}; diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 7082fecf7ce8..6c48bf6ce370 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -107,7 +107,7 @@ static struct scsi_host_template pm8001_sht = { #ifdef CONFIG_COMPAT .compat_ioctl = sas_ioctl, #endif - .shost_attrs = pm8001_host_attrs, + .shost_groups = pm8001_host_attr_groups, .track_queue_depth = 1, }; diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h index 7e999768bfd2..b43dedc5c9d9 100644 --- a/drivers/scsi/pm8001/pm8001_sas.h +++ b/drivers/scsi/pm8001/pm8001_sas.h @@ -733,7 +733,7 @@ ssize_t pm8001_get_gsm_dump(struct device *cdev, u32, char *buf); int pm80xx_fatal_errors(struct pm8001_hba_info *pm8001_ha); void pm8001_free_dev(struct pm8001_device *pm8001_dev); /* ctl shared API */ -extern struct device_attribute *pm8001_host_attrs[]; +extern const struct attribute_group *pm8001_host_attr_groups[]; static inline void pm8001_ccb_task_free_done(struct pm8001_hba_info *pm8001_ha, From patchwork Thu Oct 7 21:18:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56099C433F5 for ; Thu, 7 Oct 2021 21:20:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FDA4610A0 for ; Thu, 7 Oct 2021 21:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240908AbhJGVWZ (ORCPT ); Thu, 7 Oct 2021 17:22:25 -0400 Received: from mail-pf1-f170.google.com ([209.85.210.170]:37467 "EHLO mail-pf1-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240906AbhJGVWZ (ORCPT ); Thu, 7 Oct 2021 17:22:25 -0400 Received: by mail-pf1-f170.google.com with SMTP id q19so5927987pfl.4 for ; Thu, 07 Oct 2021 14:20:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ygEv+xZST9StHiLezL0C7azIwOvIYy/dJeMwCEgSM7E=; b=oj+uMGFQWF2p0EZpJujKF928rR12DZFh9dcMSZXdC8R6idkjg5Kk3oigw5Q33ntSJp 6R2qcPFz7nSg8OgqX5lwu2LFpBnHnnRpxTJUugo0PEUkhs71+YASWF4F+TCALjKr/sOa uruaI2hqccr+ad4XHvOYXMvWNwijVjYx7wN7mPlUZeIvr8Jk4gumvNFf7ropWwE0Bstl yZwm+2hc8s5feOzEzvYphjfGAjkFD2DewdVL2wqHemwlF/3BbRi93aveS1/znQY7yuy2 mm99YOKx57fMr4fDm7qx/1Q+wB4lf9LCJxWAU6Sk0Y6EETWUXmUhYnUapM36yxY/b9Kv my+w== X-Gm-Message-State: AOAM533yC2473y/LMiGjlV+jce4K2TojyTLjNxFJneDVn/kvyG314g4h E5ai+tgIXOdjSyBH4M81S1E= X-Google-Smtp-Source: ABdhPJwiKu2rRFqvqGhPiAjGRrt/dzMebMBbP0Hq2/ZRPGopfglpJDrWwslWkmgLQPXD6r8dkpSpTw== X-Received: by 2002:a05:6a00:10c6:b0:44c:56ff:91ea with SMTP id d6-20020a056a0010c600b0044c56ff91eamr6495115pfu.25.1633641629515; Thu, 07 Oct 2021 14:20:29 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:28 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , "James E.J. Bottomley" Subject: [PATCH v2 36/46] scsi: pmcraid: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:42 -0700 Message-Id: <20211007211852.256007-37-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/pmcraid.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index bffd9a9349e7..2cdddb53ca21 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -4097,13 +4097,21 @@ static struct device_attribute pmcraid_adapter_id_attr = { .show = pmcraid_show_adapter_id, }; -static struct device_attribute *pmcraid_host_attrs[] = { - &pmcraid_log_level_attr, - &pmcraid_driver_version_attr, - &pmcraid_adapter_id_attr, +static struct attribute *pmcraid_host_attrs[] = { + &pmcraid_log_level_attr.attr, + &pmcraid_driver_version_attr.attr, + &pmcraid_adapter_id_attr.attr, NULL, }; +static const struct attribute_group pmcraid_host_attr_group = { + .attrs = pmcraid_host_attrs +}; + +static const struct attribute_group *pmcraid_host_attr_groups[] = { + &pmcraid_host_attr_group, + NULL +}; /* host template structure for pmcraid driver */ static struct scsi_host_template pmcraid_host_template = { @@ -4126,7 +4134,7 @@ static struct scsi_host_template pmcraid_host_template = { .max_sectors = PMCRAID_IOA_MAX_SECTORS, .no_write_same = 1, .cmd_per_lun = PMCRAID_MAX_CMD_PER_LUN, - .shost_attrs = pmcraid_host_attrs, + .shost_groups = pmcraid_host_attr_groups, .proc_name = PMCRAID_DRIVER_NAME, }; From patchwork Thu Oct 7 21:18:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543515 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6209C433EF for ; Thu, 7 Oct 2021 21:20:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEC1F61077 for ; Thu, 7 Oct 2021 21:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241064AbhJGVW0 (ORCPT ); Thu, 7 Oct 2021 17:22:26 -0400 Received: from mail-pf1-f176.google.com ([209.85.210.176]:33762 "EHLO mail-pf1-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241022AbhJGVWZ (ORCPT ); Thu, 7 Oct 2021 17:22:25 -0400 Received: by mail-pf1-f176.google.com with SMTP id s16so6464590pfk.0 for ; Thu, 07 Oct 2021 14:20:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o69cnK/U/335PRQimSnXYVHJgfg3vwULDtpD2oVWF7Y=; b=rKsYKvC8dCdboLAGy4SpUtJWD4eERPiojiLBImHJMk/7hxsMQ/Xscd2tCXV8PKIDxe OU/xMze4UnbBen6Fgc7x54376KPH8mxPznksm19USq/H/OHbuCI02gzeVowSROB9zGW/ Ejn8ryoW5IUUh3EAUMB3/onqkiaoA++N2yUCR91q1d5Bcyq8O1VNqrANpjwCxlKmLiYT ZA1XIkAtGEV2kwLPecmSNqQWrj+B+Q04VyPVaRc7i5kYHN4ym+UoV7INtlXlN851Mg5r /t1DpnMp1iiKcKDTN1gDK9kUWm0fpuxUL+/BaXt+QvVAZmzS/hVHNUjxX3Pm5/YKmLOA 1huQ== X-Gm-Message-State: AOAM533u/ngH4bEvYT9hy+vhLx9o7qu51tUFvJLDEiiKn9Ec8luKZG3Z wcMx50+WaVecsDXM6xpLXwY= X-Google-Smtp-Source: ABdhPJxE6gtA4k5ZKFfXe/2kMPFMbKMl4VeUpf4avi9A5GgXxUxBE3gQVQNoEqpOW1v8KNbdGHBvRQ== X-Received: by 2002:a62:7a4f:0:b0:448:6a41:14bb with SMTP id v76-20020a627a4f000000b004486a4114bbmr6598015pfc.31.1633641631145; Thu, 07 Oct 2021 14:20:31 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:30 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Saurav Kashyap , Javed Hasan , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" Subject: [PATCH v2 37/46] scsi: qedf: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:43 -0700 Message-Id: <20211007211852.256007-38-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/qedf/qedf.h | 2 +- drivers/scsi/qedf/qedf_attr.c | 15 ++++++++++++--- drivers/scsi/qedf/qedf_main.c | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/qedf/qedf.h b/drivers/scsi/qedf/qedf.h index ba94413fe2ea..44d2058a4d78 100644 --- a/drivers/scsi/qedf/qedf.h +++ b/drivers/scsi/qedf/qedf.h @@ -498,7 +498,7 @@ extern void qedf_process_abts_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, extern struct qedf_ioreq *qedf_alloc_cmd(struct qedf_rport *fcport, u8 cmd_type); -extern struct device_attribute *qedf_host_attrs[]; +extern const struct attribute_group *qedf_host_attr_groups[]; extern void qedf_cmd_timer_set(struct qedf_ctx *qedf, struct qedf_ioreq *io_req, unsigned int timer_msec); extern int qedf_init_mp_req(struct qedf_ioreq *io_req); diff --git a/drivers/scsi/qedf/qedf_attr.c b/drivers/scsi/qedf/qedf_attr.c index 461c0c9180c4..8f04e11d0903 100644 --- a/drivers/scsi/qedf/qedf_attr.c +++ b/drivers/scsi/qedf/qedf_attr.c @@ -60,12 +60,21 @@ static ssize_t fka_period_show(struct device *dev, static DEVICE_ATTR_RO(fcoe_mac); static DEVICE_ATTR_RO(fka_period); -struct device_attribute *qedf_host_attrs[] = { - &dev_attr_fcoe_mac, - &dev_attr_fka_period, +static struct attribute *qedf_host_attrs[] = { + &dev_attr_fcoe_mac.attr, + &dev_attr_fka_period.attr, NULL, }; +static const struct attribute_group qedf_host_attr_group = { + .attrs = qedf_host_attrs +}; + +const struct attribute_group *qedf_host_attr_groups[] = { + &qedf_host_attr_group, + NULL +}; + extern const struct qed_fcoe_ops *qed_ops; void qedf_capture_grc_dump(struct qedf_ctx *qedf) diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index 42d0d941dba5..3dd60acea4d8 100644 --- a/drivers/scsi/qedf/qedf_main.c +++ b/drivers/scsi/qedf/qedf_main.c @@ -986,7 +986,7 @@ static struct scsi_host_template qedf_host_template = { .cmd_per_lun = 32, .max_sectors = 0xffff, .queuecommand = qedf_queuecommand, - .shost_attrs = qedf_host_attrs, + .shost_groups = qedf_host_attr_groups, .eh_abort_handler = qedf_eh_abort, .eh_device_reset_handler = qedf_eh_device_reset, /* lun reset */ .eh_target_reset_handler = qedf_eh_target_reset, /* target reset */ From patchwork Thu Oct 7 21:18:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25241C433EF for ; Thu, 7 Oct 2021 21:20:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F498610A0 for ; Thu, 7 Oct 2021 21:20:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241117AbhJGVW3 (ORCPT ); Thu, 7 Oct 2021 17:22:29 -0400 Received: from mail-pg1-f172.google.com ([209.85.215.172]:41681 "EHLO mail-pg1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241022AbhJGVW1 (ORCPT ); Thu, 7 Oct 2021 17:22:27 -0400 Received: by mail-pg1-f172.google.com with SMTP id v11so1029062pgb.8 for ; Thu, 07 Oct 2021 14:20:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4R4gXLjjIZLIkF7sgikLLbh6/kop4jDlVkJ3In8wKi4=; b=BdBGzqEAJDeD5mBUrHlg/y1kHCHVM/F3Mx7x9ojJRNB1ote8YY8ehZ5oaL3ziNAcS1 NzCoZbsXx655T99GGUJm1nwxvECEU9Bg8aDWC1xpmYFeC327vX0N9nZsZGePIw7R1xBn mSWZr/nAc8u2u590oElV+2js6qseBvBIeuO5sbDlaKUeWefAj6gSGT8DMYG1znBRjSWg HWYvVVjOdXr5HPEhOLu8x7z3IpACT2FM2abcLHtP8KUIg7JFMYRnQ/9gvnlCdBVGXUhM 8kLNcPq8YatgGWlumrkd1AbPtFnU77fFT3Mq4m8V8fTKB7OIxi6CdpjSdmwmie+Jo/LR 9gXw== X-Gm-Message-State: AOAM532mwGbJzDu8KvxfKhOO7YBYOqtfv8CJJ41LEHvDrYE6C3kQqX9N xvznU7M0BfrxvfHnEbY4lRE= X-Google-Smtp-Source: ABdhPJygH4GAu4J0n7b8pLdU1Pp6eABODuFVwUwhklumC4AqZGp2nZrR/O/ihW513Ag3/7hTaXN/ug== X-Received: by 2002:a62:8284:0:b0:44c:6490:4a2d with SMTP id w126-20020a628284000000b0044c64904a2dmr6698366pfd.38.1633641632810; Thu, 07 Oct 2021 14:20:32 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:32 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Nilesh Javali , Manish Rangankar , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" Subject: [PATCH v2 38/46] scsi: qedi: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:44 -0700 Message-Id: <20211007211852.256007-39-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/qedi/qedi_gbl.h | 2 +- drivers/scsi/qedi/qedi_iscsi.c | 2 +- drivers/scsi/qedi/qedi_sysfs.c | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/qedi/qedi_gbl.h b/drivers/scsi/qedi/qedi_gbl.h index 9f8e8ef405a1..84e575fbd491 100644 --- a/drivers/scsi/qedi/qedi_gbl.h +++ b/drivers/scsi/qedi/qedi_gbl.h @@ -22,7 +22,7 @@ extern struct iscsi_transport qedi_iscsi_transport; extern const struct qed_iscsi_ops *qedi_ops; extern const struct qedi_debugfs_ops qedi_debugfs_ops[]; extern const struct file_operations qedi_dbg_fops[]; -extern struct device_attribute *qedi_shost_attrs[]; +extern const struct attribute_group *qedi_shost_attr_groups[]; int qedi_alloc_sq(struct qedi_ctx *qedi, struct qedi_endpoint *ep); void qedi_free_sq(struct qedi_ctx *qedi, struct qedi_endpoint *ep); diff --git a/drivers/scsi/qedi/qedi_iscsi.c b/drivers/scsi/qedi/qedi_iscsi.c index c5260429c637..29b8e7a88653 100644 --- a/drivers/scsi/qedi/qedi_iscsi.c +++ b/drivers/scsi/qedi/qedi_iscsi.c @@ -58,7 +58,7 @@ struct scsi_host_template qedi_host_template = { .max_sectors = 0xffff, .dma_boundary = QEDI_HW_DMA_BOUNDARY, .cmd_per_lun = 128, - .shost_attrs = qedi_shost_attrs, + .shost_groups = qedi_shost_attr_groups, }; static void qedi_conn_free_login_resources(struct qedi_ctx *qedi, diff --git a/drivers/scsi/qedi/qedi_sysfs.c b/drivers/scsi/qedi/qedi_sysfs.c index be174d30eb7c..2ce8b3926e0a 100644 --- a/drivers/scsi/qedi/qedi_sysfs.c +++ b/drivers/scsi/qedi/qedi_sysfs.c @@ -42,8 +42,17 @@ static ssize_t speed_show(struct device *dev, static DEVICE_ATTR_RO(port_state); static DEVICE_ATTR_RO(speed); -struct device_attribute *qedi_shost_attrs[] = { - &dev_attr_port_state, - &dev_attr_speed, +static struct attribute *qedi_shost_attrs[] = { + &dev_attr_port_state.attr, + &dev_attr_speed.attr, + NULL +}; + +static const struct attribute_group qedi_shost_attr_group = { + .attrs = qedi_shost_attrs +}; + +const struct attribute_group *qedi_shost_attr_groups[] = { + &qedi_shost_attr_group, NULL }; From patchwork Thu Oct 7 21:18:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543519 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D63A1C433F5 for ; Thu, 7 Oct 2021 21:20:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0B0A610A5 for ; Thu, 7 Oct 2021 21:20:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241174AbhJGVWa (ORCPT ); Thu, 7 Oct 2021 17:22:30 -0400 Received: from mail-pj1-f49.google.com ([209.85.216.49]:54972 "EHLO mail-pj1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233949AbhJGVW2 (ORCPT ); Thu, 7 Oct 2021 17:22:28 -0400 Received: by mail-pj1-f49.google.com with SMTP id np13so5901057pjb.4 for ; Thu, 07 Oct 2021 14:20:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+zV95fuzcw/1F5E6I+0GGTqawzS1QjJLjxm6SJSTdxs=; b=A0Wv2G+QHNO5S5eQwfq6qrGZYtFShUjKaUc176vUdJJHzRWqtrMXVsjNNEqLUcv5q4 6/9nKTNkMuhT9mz7t4pQl+HYdJ/c9KjgUcnJud0d/SfRH/rfnQktwMiyxZzUy2vByyyX BFIXio5KV5MZgNjOFDG7GJAUDERQiqr7OoYbb0WHI5gtj9q3mah8JbBj3latPIIKInq6 y1Q7yvzvHn+vbjgEnJMHWqA1YiMfXTEjB2dji6hlYz188ketFXp/eJHh4wlqUponr4se TE4vi36ftMA2NtDFagM8ioy4le74CxlsAq4h6aAFAYJ3H718V+Chpzv1O1lUXU+HaGeH 6IGw== X-Gm-Message-State: AOAM532JXdOq7bost4eT76gSLojWWtB384BSuBAUUOBSOEQ+1yLDXbcT SiJS5Y+T33ciEzLg4YsDm+A= X-Google-Smtp-Source: ABdhPJxs2UO7mYW3p92yxIeONM2ATMsQFRHe1zd4VhkdPaTFfARi7/E4LUnwbIZ9G61u5Pnp6Y78wg== X-Received: by 2002:a17:903:1207:b0:138:e2f9:6c98 with SMTP id l7-20020a170903120700b00138e2f96c98mr6169663plh.11.1633641634285; Thu, 07 Oct 2021 14:20:34 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:33 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Nilesh Javali , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" Subject: [PATCH v2 39/46] scsi: qla2xxx: Remove a declaration Date: Thu, 7 Oct 2021 14:18:45 -0700 Message-Id: <20211007211852.256007-40-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Since there is no definition for the qla2x00_host_attrs_dm array, remove its declaration. Signed-off-by: Bart Van Assche --- drivers/scsi/qla2xxx/qla_gbl.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 8aadcdeca6cb..5ff974e98783 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -743,7 +743,6 @@ uint qla25xx_fdmi_port_speed_currently(struct qla_hw_data *); */ struct device_attribute; extern struct device_attribute *qla2x00_host_attrs[]; -extern struct device_attribute *qla2x00_host_attrs_dm[]; struct fc_function_template; extern struct fc_function_template qla2xxx_transport_functions; extern struct fc_function_template qla2xxx_transport_vport_functions; From patchwork Thu Oct 7 21:18:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543521 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5CAFC433EF for ; Thu, 7 Oct 2021 21:20:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F7AB610A0 for ; Thu, 7 Oct 2021 21:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233949AbhJGVWc (ORCPT ); Thu, 7 Oct 2021 17:22:32 -0400 Received: from mail-pj1-f51.google.com ([209.85.216.51]:55899 "EHLO mail-pj1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240906AbhJGVWa (ORCPT ); Thu, 7 Oct 2021 17:22:30 -0400 Received: by mail-pj1-f51.google.com with SMTP id on6so5890886pjb.5 for ; Thu, 07 Oct 2021 14:20:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kbyIuczcP0SXwb1cAx3u49eixkEb3S17BLa2Wb9+hxQ=; b=gXtD6Ta3CfjfgPuHSyGEiDVnJM/QYdufB7t3MYJl7dozLw+6fELKPnJL9gMG1EbLPJ fT8BzEWORbvKU7xAi5gn6yctjbU9P1HKtA33nV4+ZJlnZ7Sk9msc8ebsdLa3G4G4qzkB P9WLVREYWtDtuyuaj0gSSE/NmfV+BlkW/4VZzk6m4WhhJuihrMZ8YopXu1hZ9bF+SVWf PO1H9vSAP5MfPda14FU9WjTPA2zSFbYrWt0WlrxNNRnkIjwfZaGy2dqt/fkR7u+JZg64 qjo2HrMQrdkbUhaYj+VXTWq5CpDXwWsn3ymUXiReUDFkEKaJ1qaevNOPZLAMsKq+LTce Z30A== X-Gm-Message-State: AOAM530bfYcRts5LHZskw//lB9kAFp8PzHjvmPqHkjTtLPmjOUDYSNFA jbIkuAUzoWeGKZ+EXIydjqG2T1QYt504Ug== X-Google-Smtp-Source: ABdhPJwU9qv5j4FufZXZfeKUS89ikVUhnafWECNp1ca+8PW1hd2GPFgE7MfvVslKbeT5674lyn0vbQ== X-Received: by 2002:a17:90b:8c:: with SMTP id bb12mr8011173pjb.181.1633641635946; Thu, 07 Oct 2021 14:20:35 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:35 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Nilesh Javali , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" Subject: [PATCH v2 40/46] scsi: qla2xxx: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:46 -0700 Message-Id: <20211007211852.256007-41-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Additionally, remove qla_insert_tgt_attrs() and replace it with qla_host_attr_is_visible(). Signed-off-by: Bart Van Assche --- drivers/scsi/qla2xxx/qla_attr.c | 118 +++++++++++++++++--------------- drivers/scsi/qla2xxx/qla_gbl.h | 3 +- drivers/scsi/qla2xxx/qla_os.c | 5 +- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index cb5f2ecb652d..ce34b759479a 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -2481,72 +2481,76 @@ static DEVICE_ATTR(port_no, 0444, qla2x00_port_no_show, NULL); static DEVICE_ATTR(fw_attr, 0444, qla2x00_fw_attr_show, NULL); static DEVICE_ATTR_RO(edif_doorbell); - -struct device_attribute *qla2x00_host_attrs[] = { - &dev_attr_driver_version, - &dev_attr_fw_version, - &dev_attr_serial_num, - &dev_attr_isp_name, - &dev_attr_isp_id, - &dev_attr_model_name, - &dev_attr_model_desc, - &dev_attr_pci_info, - &dev_attr_link_state, - &dev_attr_zio, - &dev_attr_zio_timer, - &dev_attr_beacon, - &dev_attr_beacon_config, - &dev_attr_optrom_bios_version, - &dev_attr_optrom_efi_version, - &dev_attr_optrom_fcode_version, - &dev_attr_optrom_fw_version, - &dev_attr_84xx_fw_version, - &dev_attr_total_isp_aborts, - &dev_attr_serdes_version, - &dev_attr_mpi_version, - &dev_attr_phy_version, - &dev_attr_flash_block_size, - &dev_attr_vlan_id, - &dev_attr_vn_port_mac_address, - &dev_attr_fabric_param, - &dev_attr_fw_state, - &dev_attr_optrom_gold_fw_version, - &dev_attr_thermal_temp, - &dev_attr_diag_requests, - &dev_attr_diag_megabytes, - &dev_attr_fw_dump_size, - &dev_attr_allow_cna_fw_dump, - &dev_attr_pep_version, - &dev_attr_min_supported_speed, - &dev_attr_max_supported_speed, - &dev_attr_zio_threshold, - &dev_attr_dif_bundle_statistics, - &dev_attr_port_speed, - &dev_attr_port_no, - &dev_attr_fw_attr, - &dev_attr_dport_diagnostics, - &dev_attr_edif_doorbell, - &dev_attr_mpi_pause, +static struct attribute *qla2x00_host_attrs[] = { + &dev_attr_driver_version.attr, + &dev_attr_fw_version.attr, + &dev_attr_serial_num.attr, + &dev_attr_isp_name.attr, + &dev_attr_isp_id.attr, + &dev_attr_model_name.attr, + &dev_attr_model_desc.attr, + &dev_attr_pci_info.attr, + &dev_attr_link_state.attr, + &dev_attr_zio.attr, + &dev_attr_zio_timer.attr, + &dev_attr_beacon.attr, + &dev_attr_beacon_config.attr, + &dev_attr_optrom_bios_version.attr, + &dev_attr_optrom_efi_version.attr, + &dev_attr_optrom_fcode_version.attr, + &dev_attr_optrom_fw_version.attr, + &dev_attr_84xx_fw_version.attr, + &dev_attr_total_isp_aborts.attr, + &dev_attr_serdes_version.attr, + &dev_attr_mpi_version.attr, + &dev_attr_phy_version.attr, + &dev_attr_flash_block_size.attr, + &dev_attr_vlan_id.attr, + &dev_attr_vn_port_mac_address.attr, + &dev_attr_fabric_param.attr, + &dev_attr_fw_state.attr, + &dev_attr_optrom_gold_fw_version.attr, + &dev_attr_thermal_temp.attr, + &dev_attr_diag_requests.attr, + &dev_attr_diag_megabytes.attr, + &dev_attr_fw_dump_size.attr, + &dev_attr_allow_cna_fw_dump.attr, + &dev_attr_pep_version.attr, + &dev_attr_min_supported_speed.attr, + &dev_attr_max_supported_speed.attr, + &dev_attr_zio_threshold.attr, + &dev_attr_dif_bundle_statistics.attr, + &dev_attr_port_speed.attr, + &dev_attr_port_no.attr, + &dev_attr_fw_attr.attr, + &dev_attr_dport_diagnostics.attr, + &dev_attr_edif_doorbell.attr, + &dev_attr_mpi_pause.attr, NULL, /* reserve for qlini_mode */ NULL, /* reserve for ql2xiniexchg */ NULL, /* reserve for ql2xexchoffld */ NULL, }; -void qla_insert_tgt_attrs(void) +static umode_t qla_host_attr_is_visible(struct kobject *kobj, + struct attribute *attr, int i) { - struct device_attribute **attr; + if (attr == &dev_attr_qlini_mode.attr || + attr == &dev_attr_ql2xiniexchg.attr || + attr == &dev_attr_ql2xexchoffld.attr) + return ql2x_ini_mode == QLA2XXX_INI_MODE_DUAL ? attr->mode : 0; + return attr->mode; +} - /* advance to empty slot */ - for (attr = &qla2x00_host_attrs[0]; *attr; ++attr) - continue; +static const struct attribute_group qla2x00_host_attr_group = { + .is_visible = qla_host_attr_is_visible, + .attrs = qla2x00_host_attrs +}; - *attr = &dev_attr_qlini_mode; - attr++; - *attr = &dev_attr_ql2xiniexchg; - attr++; - *attr = &dev_attr_ql2xexchoffld; -} +const struct attribute_group *qla2x00_host_attr_groups[] = { + &qla2x00_host_attr_group, + NULL +}; /* Host attributes. */ diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 5ff974e98783..dd09434f1be1 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -742,7 +742,7 @@ uint qla25xx_fdmi_port_speed_currently(struct qla_hw_data *); * Global Function Prototypes in qla_attr.c source file. */ struct device_attribute; -extern struct device_attribute *qla2x00_host_attrs[]; +extern const struct attribute_group *qla2x00_host_attr_groups[]; struct fc_function_template; extern struct fc_function_template qla2xxx_transport_functions; extern struct fc_function_template qla2xxx_transport_vport_functions; @@ -756,7 +756,6 @@ extern int qla2x00_echo_test(scsi_qla_host_t *, extern int qla24xx_update_all_fcp_prio(scsi_qla_host_t *); extern int qla24xx_fcp_prio_cfg_valid(scsi_qla_host_t *, struct qla_fcp_prio_cfg *, uint8_t); -void qla_insert_tgt_attrs(void); /* * Global Function Prototypes in qla_dfs.c source file. */ diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 03ff2596715b..d9f30897c1a2 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -7943,7 +7943,7 @@ struct scsi_host_template qla2xxx_driver_template = { .sg_tablesize = SG_ALL, .max_sectors = 0xFFFF, - .shost_attrs = qla2x00_host_attrs, + .shost_groups = qla2x00_host_attr_groups, .supported_mode = MODE_INITIATOR, .track_queue_depth = 1, @@ -8131,9 +8131,6 @@ qla2x00_module_init(void) if (ql2xextended_error_logging == 1) ql2xextended_error_logging = QL_DBG_DEFAULT1_MASK; - if (ql2x_ini_mode == QLA2XXX_INI_MODE_DUAL) - qla_insert_tgt_attrs(); - qla2xxx_transport_template = fc_attach_transport(&qla2xxx_transport_functions); if (!qla2xxx_transport_template) { From patchwork Thu Oct 7 21:18:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543523 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FB3EC433FE for ; Thu, 7 Oct 2021 21:20:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 629FE61077 for ; Thu, 7 Oct 2021 21:20:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241146AbhJGVWd (ORCPT ); Thu, 7 Oct 2021 17:22:33 -0400 Received: from mail-pj1-f51.google.com ([209.85.216.51]:53208 "EHLO mail-pj1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238287AbhJGVWb (ORCPT ); Thu, 7 Oct 2021 17:22:31 -0400 Received: by mail-pj1-f51.google.com with SMTP id oa4so5203890pjb.2 for ; Thu, 07 Oct 2021 14:20:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DrQMDwdkqIz01ZAK1JAuH5KT2QgYQkcbJrXXgoJgBPQ=; b=gKz3JznxzhDp43pbR3CWi3c8NTqDaMi5l/6JFXAw3G0lePF//MmLHWKuZ/McU++xc7 2+DZb/SwYO6fCYTvDIR3CBy4YOND0PpE8uJnizmEn96mmCSj4FvmLaPfY8Oigm6+Upim QEnC+E32us4UVMbJvzyVbZ3XZN25V7kVX0rPTZ9Khc3va3++noY4Hre4R5JaNfCMFu87 UFarY3E8b0ab8NcMvJtH1Q7tNk7aSLn3+uJXGdnSmCUx+ghgIQW6vv8eSD9ZP7ZViAE6 8GC0fJ9Hw3US64PKs+B7Jf5zBrT0w1xMyGCs3fDYN59/YDtJP549rmeZTqZF+WBfWrDI e9gQ== X-Gm-Message-State: AOAM532HDTqt4JZkobq0IoxhOsIh1NP1pNioFzOX0+h3ey0NbPbM2QYS XxcVXHzLrOW9v0n2sCb+SDA= X-Google-Smtp-Source: ABdhPJz9VUIIAl+batr9IcxHW8E4aHE7dxvLuSGwEC5nsHQn9iQA5tKN4Ak9sUV8jGKVGyEiyeSR4A== X-Received: by 2002:a17:902:dacf:b0:13e:ab53:87dc with SMTP id q15-20020a170902dacf00b0013eab5387dcmr5997013plx.78.1633641637630; Thu, 07 Oct 2021 14:20:37 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:37 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Nilesh Javali , Manish Rangankar , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" Subject: [PATCH v2 41/46] scsi: qla4xxx: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:47 -0700 Message-Id: <20211007211852.256007-42-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/qla4xxx/ql4_attr.c | 41 ++++++++++++++++++++------------- drivers/scsi/qla4xxx/ql4_glbl.h | 3 ++- drivers/scsi/qla4xxx/ql4_os.c | 2 +- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/drivers/scsi/qla4xxx/ql4_attr.c b/drivers/scsi/qla4xxx/ql4_attr.c index ec4352818fbf..2595b64febf9 100644 --- a/drivers/scsi/qla4xxx/ql4_attr.c +++ b/drivers/scsi/qla4xxx/ql4_attr.c @@ -330,21 +330,30 @@ static DEVICE_ATTR(fw_ext_timestamp, S_IRUGO, qla4xxx_fw_ext_timestamp_show, static DEVICE_ATTR(fw_load_src, S_IRUGO, qla4xxx_fw_load_src_show, NULL); static DEVICE_ATTR(fw_uptime, S_IRUGO, qla4xxx_fw_uptime_show, NULL); -struct device_attribute *qla4xxx_host_attrs[] = { - &dev_attr_fw_version, - &dev_attr_serial_num, - &dev_attr_iscsi_version, - &dev_attr_optrom_version, - &dev_attr_board_id, - &dev_attr_fw_state, - &dev_attr_phy_port_cnt, - &dev_attr_phy_port_num, - &dev_attr_iscsi_func_cnt, - &dev_attr_hba_model, - &dev_attr_fw_timestamp, - &dev_attr_fw_build_user, - &dev_attr_fw_ext_timestamp, - &dev_attr_fw_load_src, - &dev_attr_fw_uptime, +static struct attribute *qla4xxx_host_attrs[] = { + &dev_attr_fw_version.attr, + &dev_attr_serial_num.attr, + &dev_attr_iscsi_version.attr, + &dev_attr_optrom_version.attr, + &dev_attr_board_id.attr, + &dev_attr_fw_state.attr, + &dev_attr_phy_port_cnt.attr, + &dev_attr_phy_port_num.attr, + &dev_attr_iscsi_func_cnt.attr, + &dev_attr_hba_model.attr, + &dev_attr_fw_timestamp.attr, + &dev_attr_fw_build_user.attr, + &dev_attr_fw_ext_timestamp.attr, + &dev_attr_fw_load_src.attr, + &dev_attr_fw_uptime.attr, NULL, }; + +static const struct attribute_group qla4xxx_host_attr_group = { + .attrs = qla4xxx_host_attrs +}; + +const struct attribute_group *qla4xxx_host_attr_groups[] = { + &qla4xxx_host_attr_group, + NULL +}; diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h index ea60057b2e20..25b33194e811 100644 --- a/drivers/scsi/qla4xxx/ql4_glbl.h +++ b/drivers/scsi/qla4xxx/ql4_glbl.h @@ -286,5 +286,6 @@ extern int ql4xenablemsix; extern int ql4xmdcapmask; extern int ql4xenablemd; -extern struct device_attribute *qla4xxx_host_attrs[]; +extern const struct attribute_group *qla4xxx_host_attr_groups[]; + #endif /* _QLA4x_GBL_H */ diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index f1ea65c6e5f5..fc9180816455 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -241,7 +241,7 @@ static struct scsi_host_template qla4xxx_driver_template = { .sg_tablesize = SG_ALL, .max_sectors = 0xFFFF, - .shost_attrs = qla4xxx_host_attrs, + .shost_groups = qla4xxx_host_attr_groups, .host_reset = qla4xxx_host_reset, .vendor_id = SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_QLOGIC, }; From patchwork Thu Oct 7 21:18:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32A32C433F5 for ; Thu, 7 Oct 2021 21:20:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 18F13610A5 for ; Thu, 7 Oct 2021 21:20:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241062AbhJGVWe (ORCPT ); Thu, 7 Oct 2021 17:22:34 -0400 Received: from mail-pg1-f178.google.com ([209.85.215.178]:44639 "EHLO mail-pg1-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241012AbhJGVWd (ORCPT ); Thu, 7 Oct 2021 17:22:33 -0400 Received: by mail-pg1-f178.google.com with SMTP id s11so1022337pgr.11 for ; Thu, 07 Oct 2021 14:20:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bFUyWvP294XKjeKbW0DRqZMjX2G+ZwKoro0KSFlEbXk=; b=1UbwfVX3F3zG1bl63QTxBLMVO8GM1bD6KbpOK1JYySGoAKXgKcSNZSuAM0UBcwTSEO aDUu0hTOw/EONMJ2lmO+tDPFb5jpq0PIOxffhItP935ng0REs5i5yfwzPk17krB1AAa0 BbExOC9+bxyKyFLlNFzCuik+izS1AU2qzhizZ9orpzCPogve+9rbMsYeooSL2JLvEOzZ D47szTVg7RcTbzvcaoKz08Vo9lqyrOkUM6exYZ3Fo1IOy8LMFh0umWqPMnK4mRGhg41l J+sNmm3jOTmnTTMQnrPRDfTc0Ep8okNI3evX4IyBKJcA7wf3HcsaTmmNLl1dFJ1qmGBy FQ4Q== X-Gm-Message-State: AOAM530HUIUdwaOygSezQwxUdiHAo95FWaHBtj0DpQsD7SamD5mr4ac+ e5bN9ls6WV/7wJ+VE7SOZmY= X-Google-Smtp-Source: ABdhPJznQATJ59hwtYuWUiaGgcciLU/Ti9Z8aL+LzehxAkLQ2defAXtjnNX3mTeuVzbp6aqtVtEe7A== X-Received: by 2002:a63:105c:: with SMTP id 28mr1483233pgq.187.1633641639055; Thu, 07 Oct 2021 14:20:39 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:38 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Don Brace , "James E.J. Bottomley" Subject: [PATCH v2 42/46] scsi: smartpqi: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:48 -0700 Message-Id: <20211007211852.256007-43-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/smartpqi/smartpqi_init.c | 60 +++++++++++++++++---------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index b966ce3b4385..8386ee556992 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -6847,17 +6847,26 @@ static DEVICE_ATTR(enable_r5_writes, 0644, static DEVICE_ATTR(enable_r6_writes, 0644, pqi_host_enable_r6_writes_show, pqi_host_enable_r6_writes_store); -static struct device_attribute *pqi_shost_attrs[] = { - &dev_attr_driver_version, - &dev_attr_firmware_version, - &dev_attr_model, - &dev_attr_serial_number, - &dev_attr_vendor, - &dev_attr_rescan, - &dev_attr_lockup_action, - &dev_attr_enable_stream_detection, - &dev_attr_enable_r5_writes, - &dev_attr_enable_r6_writes, +static struct attribute *pqi_shost_attrs[] = { + &dev_attr_driver_version.attr, + &dev_attr_firmware_version.attr, + &dev_attr_model.attr, + &dev_attr_serial_number.attr, + &dev_attr_vendor.attr, + &dev_attr_rescan.attr, + &dev_attr_lockup_action.attr, + &dev_attr_enable_stream_detection.attr, + &dev_attr_enable_r5_writes.attr, + &dev_attr_enable_r6_writes.attr, + NULL +}; + +static const struct attribute_group pqi_shost_attr_group = { + .attrs = pqi_shost_attrs +}; + +static const struct attribute_group *pqi_shost_groups[] = { + &pqi_shost_attr_group, NULL }; @@ -7129,14 +7138,23 @@ static DEVICE_ATTR(ssd_smart_path_enabled, 0444, pqi_ssd_smart_path_enabled_show static DEVICE_ATTR(raid_level, 0444, pqi_raid_level_show, NULL); static DEVICE_ATTR(raid_bypass_cnt, 0444, pqi_raid_bypass_cnt_show, NULL); -static struct device_attribute *pqi_sdev_attrs[] = { - &dev_attr_lunid, - &dev_attr_unique_id, - &dev_attr_path_info, - &dev_attr_sas_address, - &dev_attr_ssd_smart_path_enabled, - &dev_attr_raid_level, - &dev_attr_raid_bypass_cnt, +static struct attribute *pqi_sdev_attrs[] = { + &dev_attr_lunid.attr, + &dev_attr_unique_id.attr, + &dev_attr_path_info.attr, + &dev_attr_sas_address.attr, + &dev_attr_ssd_smart_path_enabled.attr, + &dev_attr_raid_level.attr, + &dev_attr_raid_bypass_cnt.attr, + NULL +}; + +static const struct attribute_group pqi_sdev_attr_group = { + .attrs = pqi_sdev_attrs +}; + +static const struct attribute_group *pqi_sdev_attr_groups[] = { + &pqi_sdev_attr_group, NULL }; @@ -7153,8 +7171,8 @@ static struct scsi_host_template pqi_driver_template = { .slave_alloc = pqi_slave_alloc, .slave_configure = pqi_slave_configure, .map_queues = pqi_map_queues, - .sdev_attrs = pqi_sdev_attrs, - .shost_attrs = pqi_shost_attrs, + .sdev_groups = pqi_sdev_attr_groups, + .shost_groups = pqi_shost_groups, }; static int pqi_register_scsi(struct pqi_ctrl_info *ctrl_info) From patchwork Thu Oct 7 21:18:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DE79C433FE for ; Thu, 7 Oct 2021 21:20:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED44F610A5 for ; Thu, 7 Oct 2021 21:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241180AbhJGVWi (ORCPT ); Thu, 7 Oct 2021 17:22:38 -0400 Received: from mail-pj1-f48.google.com ([209.85.216.48]:54070 "EHLO mail-pj1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238287AbhJGVWf (ORCPT ); Thu, 7 Oct 2021 17:22:35 -0400 Received: by mail-pj1-f48.google.com with SMTP id ls18so5903762pjb.3 for ; Thu, 07 Oct 2021 14:20:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IIxwxB+qtMA1O6WI2xi9YdeEorUR8OazdCyqzLBW5Ac=; b=OD6bdByK5qyglYPh4t+BguzCrxdGhS0ax5H4Cmh6JGmeRrpR0JREdRCmyvW3XvPS0B AlpQKvbiQI56DhczL26PyTQaFSW7KThUvKz76u1keFrMUyTWR9iQ7qtKl1guLekVQ1Bn 72yFtHSJ0uKgajQdd4hDpR+jdfj2tm0cZaEUfxQtC8X8TgT0eitDZ9XNihPOowSMdLAC Bv4NyfutgZJEJSjVqS/WdeiqIxcP7W2PFGNBH5SFkssLXI4g7e49O0MQ/jk+pQQhiWiZ aVUFzRBqduza1Ekmchg+CwehmKVlhmKRbYY9AsviJoj8xYBmRY0nBhZjwphCEvRiCG3d 30gw== X-Gm-Message-State: AOAM533Yyde7umB3XTyDtZpB8DxnTgQjg9dmdE+SKhSNb5/IRQV3cv2s 6qPevbaqBHwc4NjI/YrMS3c= X-Google-Smtp-Source: ABdhPJwpmUJ30XnNw4nVMvKuAdmZjoHv/npiRpINGOq5oWebPOAnzAkD4qTXm2zR2+YWTJreRruAAw== X-Received: by 2002:a17:90b:4a45:: with SMTP id lb5mr7932357pjb.94.1633641640673; Thu, 07 Oct 2021 14:20:40 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:40 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Karan Tilak Kumar , Sesidhar Baddela , "James E.J. Bottomley" Subject: [PATCH v2 43/46] scsi: snic: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:49 -0700 Message-Id: <20211007211852.256007-44-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/scsi/snic/snic.h | 2 +- drivers/scsi/snic/snic_attrs.c | 19 ++++++++++++++----- drivers/scsi/snic/snic_main.c | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/snic/snic.h b/drivers/scsi/snic/snic.h index f4c666285bba..13f04ae7c5bb 100644 --- a/drivers/scsi/snic/snic.h +++ b/drivers/scsi/snic/snic.h @@ -374,7 +374,7 @@ int snic_glob_init(void); void snic_glob_cleanup(void); extern struct workqueue_struct *snic_event_queue; -extern struct device_attribute *snic_attrs[]; +extern const struct attribute_group *snic_attr_groups[]; int snic_queuecommand(struct Scsi_Host *, struct scsi_cmnd *); int snic_abort_cmd(struct scsi_cmnd *); diff --git a/drivers/scsi/snic/snic_attrs.c b/drivers/scsi/snic/snic_attrs.c index 32d5d556b6f8..70c2304aca6e 100644 --- a/drivers/scsi/snic/snic_attrs.c +++ b/drivers/scsi/snic/snic_attrs.c @@ -68,10 +68,19 @@ static DEVICE_ATTR(snic_state, S_IRUGO, snic_show_state, NULL); static DEVICE_ATTR(drv_version, S_IRUGO, snic_show_drv_version, NULL); static DEVICE_ATTR(link_state, S_IRUGO, snic_show_link_state, NULL); -struct device_attribute *snic_attrs[] = { - &dev_attr_snic_sym_name, - &dev_attr_snic_state, - &dev_attr_drv_version, - &dev_attr_link_state, +static struct attribute *snic_attrs[] = { + &dev_attr_snic_sym_name.attr, + &dev_attr_snic_state.attr, + &dev_attr_drv_version.attr, + &dev_attr_link_state.attr, NULL, }; + +static const struct attribute_group snic_attr_group = { + .attrs = snic_attrs +}; + +const struct attribute_group *snic_attr_groups[] = { + &snic_attr_group, + NULL +}; diff --git a/drivers/scsi/snic/snic_main.c b/drivers/scsi/snic/snic_main.c index 14f4ce665e58..d54b5e76e9cb 100644 --- a/drivers/scsi/snic/snic_main.c +++ b/drivers/scsi/snic/snic_main.c @@ -129,7 +129,7 @@ static struct scsi_host_template snic_host_template = { .can_queue = SNIC_MAX_IO_REQ, .sg_tablesize = SNIC_MAX_SG_DESC_CNT, .max_sectors = 0x800, - .shost_attrs = snic_attrs, + .shost_groups = snic_attr_groups, .track_queue_depth = 1, .cmd_size = sizeof(struct snic_internal_io_state), .proc_name = "snic_scsi", From patchwork Thu Oct 7 21:18:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543529 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42622C433F5 for ; Thu, 7 Oct 2021 21:20:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C323610A0 for ; Thu, 7 Oct 2021 21:20:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240950AbhJGVWm (ORCPT ); Thu, 7 Oct 2021 17:22:42 -0400 Received: from mail-pj1-f45.google.com ([209.85.216.45]:41685 "EHLO mail-pj1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238287AbhJGVWm (ORCPT ); Thu, 7 Oct 2021 17:22:42 -0400 Received: by mail-pj1-f45.google.com with SMTP id na16-20020a17090b4c1000b0019f5bb661f9so6250579pjb.0 for ; Thu, 07 Oct 2021 14:20:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gKfpQzpGvviquOa/5ScRBq5qSCTQ056PvQuLg3pgnrM=; b=MjU+zHR8svJ4TE21pwKDfglkZMrJRcPtgZFLFuLjzsG39XykmYAxieKWlZ4L9ZGDH7 QF6kCIP7NEivL/gXJYsX4kEz6Nrbj7PnQt8vX36bPgi4xfB2+fQAnyu64+BCqfNR1xbx R14P96l+M/IdQLV3qsguGbltWjqq2zEsgVIheB3A6qkMD4ddj2TRi6G0Vzm69fVmGL1Y UZrLgSyodPfWCMCDlu6zcqiqmRt1I6F0zyivx6ccN0f/Mn4BWC9c6xF1/wifyOy24uvX YlDNSipiJJW/OSZERLyECtDILKQlkCheJ1tL0W7IAnvCBsg9A740YroYytkzQQyB9hVc 7cbA== X-Gm-Message-State: AOAM532aoU+LrTDWPQXJPzB1JnnP+Vl1IiDpeN9tZISWI5o2vNPiJ3KL S0UQSU/hh3fsgiHNeMDRTjA= X-Google-Smtp-Source: ABdhPJwNHWYn67vX2N6g7BqOf/T0AelGPe32rPsEHY+yoU1UGKBcGZ3IaC49Ya5MEbBWieO+38g+WQ== X-Received: by 2002:a17:90a:1942:: with SMTP id 2mr7972682pjh.195.1633641647867; Thu, 07 Oct 2021 14:20:47 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:47 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , David Kershner , Greg Kroah-Hartman , Song Chen , "Fabio M. De Francesco" , Dan Carpenter Subject: [PATCH v2 44/46] scsi: unisys: Remove the shost_attrs member Date: Thu, 7 Oct 2021 14:18:50 -0700 Message-Id: <20211007211852.256007-45-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org This patch prepares for removal of the shost_attrs member from struct scsi_host_template. Signed-off-by: Bart Van Assche --- drivers/staging/unisys/visorhba/visorhba_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c index 41f8a72a2a95..f0c647b97354 100644 --- a/drivers/staging/unisys/visorhba/visorhba_main.c +++ b/drivers/staging/unisys/visorhba/visorhba_main.c @@ -584,7 +584,6 @@ static struct scsi_host_template visorhba_driver_template = { .eh_device_reset_handler = visorhba_device_reset_handler, .eh_bus_reset_handler = visorhba_bus_reset_handler, .eh_host_reset_handler = visorhba_host_reset_handler, - .shost_attrs = NULL, #define visorhba_MAX_CMNDS 128 .can_queue = visorhba_MAX_CMNDS, .sg_tablesize = 64, From patchwork Thu Oct 7 21:18:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543531 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEAD2C433EF for ; Thu, 7 Oct 2021 21:20:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7E5B61130 for ; Thu, 7 Oct 2021 21:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240802AbhJGVWp (ORCPT ); Thu, 7 Oct 2021 17:22:45 -0400 Received: from mail-pg1-f177.google.com ([209.85.215.177]:36834 "EHLO mail-pg1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233918AbhJGVWn (ORCPT ); Thu, 7 Oct 2021 17:22:43 -0400 Received: by mail-pg1-f177.google.com with SMTP id 75so1049473pga.3 for ; Thu, 07 Oct 2021 14:20:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jz9hpG1PmutAFUR3RBwmJgaEHPLDPR3rqvzKdXRocR4=; b=wWfxi/FLyQD7RMJ0A7RXXQeIkpJElVRrJXfWzEwRo67yDekvPvYXCcueyPffW08bBP X46xvTPwSbUvv5Ixh+bMMjtvPOGl5asbkcVKST9F01te+9z4S3iKP/pGbgcdnuw8lmsi MAOsANxkyXlZxUTwqcJjkpqVizLPv9tVETdwEiN/ZTvYFk8RyWDWYwi2std3zDIH/S8j VErvGuqh2zR1oBFFAOfqpUb1/K762GfqofEU1B8ZnyHKTrJXHdijJcFhd28FyLGR+Fxs SzFODXGYVeI4E1R+rg+mb2oGdyz25ie+pqja4GZ66IES6t1mdzeIp2aDfj62q+/TVynL CjYQ== X-Gm-Message-State: AOAM532UWrAN35IAzYxtVdwhIwrxsICYuIf2TfhtuJ5JvYo0yE5oERpL 747+CE8vV4y4HpHDKyl6fEqjqsgF4PIDZg== X-Google-Smtp-Source: ABdhPJweiSrZHYMIp2EbY3uizQpyciYkvO5ANDCIbnNn5X6jw/5HuX0xTYOd8HRdsTYCmJ5zGU0LKA== X-Received: by 2002:a65:6648:: with SMTP id z8mr1549979pgv.418.1633641649252; Thu, 07 Oct 2021 14:20:49 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:48 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Alan Stern , Greg Kroah-Hartman Subject: [PATCH v2 45/46] scsi: usb: Switch to attribute groups Date: Thu, 7 Oct 2021 14:18:51 -0700 Message-Id: <20211007211852.256007-46-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Signed-off-by: Bart Van Assche --- drivers/usb/storage/scsiglue.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index e5a971b83e3f..123273c52fc8 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c @@ -588,11 +588,20 @@ static ssize_t max_sectors_store(struct device *dev, struct device_attribute *at } static DEVICE_ATTR_RW(max_sectors); -static struct device_attribute *sysfs_device_attr_list[] = { - &dev_attr_max_sectors, +static struct attribute *usb_sdev_attrs[] = { + &dev_attr_max_sectors.attr, NULL, }; +static const struct attribute_group usb_sdev_attr_group = { + .attrs = usb_sdev_attrs +}; + +static const struct attribute_group *usb_sdev_attr_groups[] = { + &usb_sdev_attr_group, + NULL +}; + /* * this defines our host template, with which we'll allocate hosts */ @@ -653,7 +662,7 @@ static const struct scsi_host_template usb_stor_host_template = { .skip_settle_delay = 1, /* sysfs device attributes */ - .sdev_attrs = sysfs_device_attr_list, + .sdev_groups = usb_sdev_attr_groups, /* module management */ .module = THIS_MODULE From patchwork Thu Oct 7 21:18:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12543533 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B130CC433F5 for ; Thu, 7 Oct 2021 21:20:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B4DA610A0 for ; Thu, 7 Oct 2021 21:20:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240809AbhJGVWq (ORCPT ); Thu, 7 Oct 2021 17:22:46 -0400 Received: from mail-pg1-f171.google.com ([209.85.215.171]:37687 "EHLO mail-pg1-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233918AbhJGVWp (ORCPT ); Thu, 7 Oct 2021 17:22:45 -0400 Received: by mail-pg1-f171.google.com with SMTP id r201so1046298pgr.4 for ; Thu, 07 Oct 2021 14:20:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zRZkSfeTymcwyw907t2wyI9vj50Y1Nohnx58Np7XFFM=; b=cZQa9/axQ7zzE7oEsJptMFJSYskJMc7Leo51mGMe3eh6Z1IcUVTBD2s8Yr/zO1grG2 NMZaJK7v3nuF/sRjQ4cE40fvf8aL0yYvyW7YIcNiyiKMpyChMpjreBOM2vFB1LeR6f35 b46VvrI9d7svT5dJN6NEkdhnHAkwQBaOgN5+EVs12gSzKrlgXGddR5xkNvRJxw0BSw03 JkBrlDFzS89Spr7oDNPcQFGaeWycYWmYcYX+Ik73HrF1XafwTy8RaLZqpzcanj60NGhd tGHoMBy0W9g4x6wv4kXxlyDuHNAbnAN5rpNy4xg0bLRIHCxePpSucDOQfGyTmzht9q27 6OqQ== X-Gm-Message-State: AOAM5306nodtv6WSwdcJIGp7PVsrxAKuq+Jtk85JxHEcj0QYCu8laHxt snKuDdK06UgkyqHFKZrBY6w= X-Google-Smtp-Source: ABdhPJw8BuGmiqB/RmDY3/lPIgRvf7eujrixyknbPDJZblfRG7lS1wX5uafU6cUh+DMeRvvCCnqf1w== X-Received: by 2002:a63:7e48:: with SMTP id o8mr1518347pgn.157.1633641651031; Thu, 07 Oct 2021 14:20:51 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:ae88:8f16:b90b:5f1d]) by smtp.gmail.com with ESMTPSA id o2sm243290pgc.47.2021.10.07.14.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 14:20:50 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Greg Kroah-Hartman , "James E.J. Bottomley" Subject: [PATCH v2 46/46] scsi: core: Remove two host template members that are no longer used Date: Thu, 7 Oct 2021 14:18:52 -0700 Message-Id: <20211007211852.256007-47-bvanassche@acm.org> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org> References: <20211007211852.256007-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org All SCSI drivers have been converted to use shost_groups and sdev_groups instead of shost_attrs or sdev_attrs. Hence remove shost_attrs and sdev_attrs. Cc: Greg Kroah-Hartman Signed-off-by: Bart Van Assche --- drivers/scsi/hosts.c | 9 --------- drivers/scsi/scsi_priv.h | 2 -- drivers/scsi/scsi_sysfs.c | 28 ---------------------------- include/scsi/scsi_device.h | 1 - include/scsi/scsi_host.h | 11 ----------- 5 files changed, 51 deletions(-) diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 3443f009a9e8..b3b7b55a90c6 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -482,15 +482,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) dev_set_name(&shost->shost_dev, "host%d", shost->host_no); shost->shost_dev.groups = shost->shost_dev_attr_groups; shost->shost_dev_attr_groups[j++] = &scsi_shost_attr_group; - if (sht->shost_attrs) { - shost->lld_attr_group = (struct attribute_group){ - .attrs = scsi_convert_dev_attrs(&shost->shost_gendev, - sht->shost_attrs) - }; - if (shost->lld_attr_group.attrs) - shost->shost_dev_attr_groups[j++] = - &shost->lld_attr_group; - } if (sht->shost_groups) { for (i = 0; sht->shost_groups[i] && j < ARRAY_SIZE(shost->shost_dev_attr_groups); diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index a5a2f18cc734..b7a82c426058 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h @@ -137,8 +137,6 @@ extern int scsi_sysfs_add_sdev(struct scsi_device *); extern int scsi_sysfs_add_host(struct Scsi_Host *); extern int scsi_sysfs_register(void); extern void scsi_sysfs_unregister(void); -struct attribute **scsi_convert_dev_attrs(struct device *dev, - struct device_attribute **dev_attr); extern void scsi_sysfs_device_initialize(struct scsi_device *); extern int scsi_sysfs_target_initialize(struct scsi_device *); extern struct scsi_transport_template blank_transport_template; diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 05b4d69d53d4..2e69fad0dc51 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1563,26 +1563,6 @@ int scsi_sysfs_add_host(struct Scsi_Host *shost) return 0; } -/* - * Convert an array of struct device_attribute pointers into an array of - * struct attribute pointers. - */ -struct attribute **scsi_convert_dev_attrs(struct device *dev, - struct device_attribute **dev_attr) -{ - struct attribute **attrs; - int i; - - for (i = 0; dev_attr[i]; i++) - ; - attrs = devm_kzalloc(dev, (i + 1) * sizeof(*attrs), GFP_KERNEL); - if (!attrs) - return NULL; - for (i = 0; dev_attr[i]; i++) - attrs[i] = &dev_attr[i]->attr; - return attrs; -} - static struct device_type scsi_dev_type = { .name = "scsi_device", .release = scsi_device_dev_release, @@ -1603,14 +1583,6 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev) dev_set_name(&sdev->sdev_gendev, "%d:%d:%d:%llu", sdev->host->host_no, sdev->channel, sdev->id, sdev->lun); sdev->gendev_attr_groups[j++] = &scsi_sdev_attr_group; - if (hostt->sdev_attrs) { - sdev->lld_attr_group = (struct attribute_group){ - .attrs = scsi_convert_dev_attrs(&sdev->sdev_gendev, - hostt->sdev_attrs) - }; - if (sdev->lld_attr_group.attrs) - sdev->gendev_attr_groups[j++] = &sdev->lld_attr_group; - } if (hostt->sdev_groups) { for (i = 0; hostt->sdev_groups[i] && j < ARRAY_SIZE(sdev->gendev_attr_groups); diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 01732aabd7c3..b1e9b3bd3a60 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -225,7 +225,6 @@ struct scsi_device { struct device sdev_gendev, sdev_dev; - struct attribute_group lld_attr_group; /* * The array size 6 provides space for one attribute group for the * SCSI core, four attribute groups defined by SCSI LLDs and one diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index ab8775811e6f..c2b4d6677a76 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -473,16 +473,6 @@ struct scsi_host_template { */ #define SCSI_DEFAULT_HOST_BLOCKED 7 - /* - * Pointer to the sysfs class properties for this host, NULL terminated. - */ - struct device_attribute **shost_attrs; - - /* - * Pointer to the SCSI device properties for this host, NULL terminated. - */ - struct device_attribute **sdev_attrs; - /* * Pointer to the SCSI host sysfs attribute groups, NULL terminated. */ @@ -700,7 +690,6 @@ struct Scsi_Host { /* ldm bits */ struct device shost_gendev, shost_dev; - struct attribute_group lld_attr_group; /* * The array size 3 provides space for one attribute group defined by * the SCSI core, one attribute group defined by the SCSI LLD and one