]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
nfit/ars: Remove ars_start_flags
authorDan Williams <dan.j.williams@intel.com>
Mon, 22 Apr 2019 23:08:10 +0000 (16:08 -0700)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 2 Jul 2019 10:07:53 +0000 (12:07 +0200)
BugLink: https://bugs.launchpad.net/bugs/1830922
commit 317a992ab9266b86b774b9f6b0f87eb4f59879a1 upstream.

The ars_start_flags property of 'struct acpi_nfit_desc' is no longer
used since ARS_REQ_SHORT and ARS_REQ_LONG were added.

Reviewed-by: Toshi Kani <toshi.kani@hpe.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/acpi/nfit/core.c
drivers/acpi/nfit/nfit.h

index f75f8f870ce37678f4ddbc0380e97e02991d11ff..1a48c92eaed5bb9838f7caa0bfb2083402fdfdaf 100644 (file)
@@ -2660,11 +2660,11 @@ static int ars_continue(struct acpi_nfit_desc *acpi_desc)
        struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc;
        struct nd_cmd_ars_status *ars_status = acpi_desc->ars_status;
 
-       memset(&ars_start, 0, sizeof(ars_start));
-       ars_start.address = ars_status->restart_address;
-       ars_start.length = ars_status->restart_length;
-       ars_start.type = ars_status->type;
-       ars_start.flags = acpi_desc->ars_start_flags;
+       ars_start = (struct nd_cmd_ars_start) {
+               .address = ars_status->restart_address,
+               .length = ars_status->restart_length,
+               .type = ars_status->type,
+       };
        rc = nd_desc->ndctl(nd_desc, NULL, ND_CMD_ARS_START, &ars_start,
                        sizeof(ars_start), &cmd_rc);
        if (rc < 0)
index 33691aecfcee8a48bafb23e71c39ab8109724cf7..871fb3de3b307c4980acd31171aaee2b2e3eba48 100644 (file)
@@ -223,7 +223,6 @@ struct acpi_nfit_desc {
        struct list_head idts;
        struct nvdimm_bus *nvdimm_bus;
        struct device *dev;
-       u8 ars_start_flags;
        struct nd_cmd_ars_status *ars_status;
        struct nfit_spa *scrub_spa;
        struct delayed_work dwork;