diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2019-02-13 12:34:00 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2019-02-20 17:18:59 -0500 |
| commit | 317a992ab9266b86b774b9f6b0f87eb4f59879a1 (patch) | |
| tree | ad86c8a6595fd35ec52ad7a3fdd1a415c94af8a1 /drivers | |
| parent | fa3ed4d981b1fc19acdd07fcb152a4bd3706892b (diff) | |
nfit/ars: Remove ars_start_flags
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/nfit/core.c | 10 | ||||
| -rw-r--r-- | drivers/acpi/nfit/nfit.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 934be96dc149..9a23ae74e82b 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c | |||
| @@ -2651,11 +2651,11 @@ static int ars_continue(struct acpi_nfit_desc *acpi_desc) | |||
| 2651 | struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc; | 2651 | struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc; |
| 2652 | struct nd_cmd_ars_status *ars_status = acpi_desc->ars_status; | 2652 | struct nd_cmd_ars_status *ars_status = acpi_desc->ars_status; |
| 2653 | 2653 | ||
| 2654 | memset(&ars_start, 0, sizeof(ars_start)); | 2654 | ars_start = (struct nd_cmd_ars_start) { |
| 2655 | ars_start.address = ars_status->restart_address; | 2655 | .address = ars_status->restart_address, |
| 2656 | ars_start.length = ars_status->restart_length; | 2656 | .length = ars_status->restart_length, |
| 2657 | ars_start.type = ars_status->type; | 2657 | .type = ars_status->type, |
| 2658 | ars_start.flags = acpi_desc->ars_start_flags; | 2658 | }; |
| 2659 | rc = nd_desc->ndctl(nd_desc, NULL, ND_CMD_ARS_START, &ars_start, | 2659 | rc = nd_desc->ndctl(nd_desc, NULL, ND_CMD_ARS_START, &ars_start, |
| 2660 | sizeof(ars_start), &cmd_rc); | 2660 | sizeof(ars_start), &cmd_rc); |
| 2661 | if (rc < 0) | 2661 | if (rc < 0) |
diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h index 33691aecfcee..871fb3de3b30 100644 --- a/drivers/acpi/nfit/nfit.h +++ b/drivers/acpi/nfit/nfit.h | |||
| @@ -223,7 +223,6 @@ struct acpi_nfit_desc { | |||
| 223 | struct list_head idts; | 223 | struct list_head idts; |
| 224 | struct nvdimm_bus *nvdimm_bus; | 224 | struct nvdimm_bus *nvdimm_bus; |
| 225 | struct device *dev; | 225 | struct device *dev; |
| 226 | u8 ars_start_flags; | ||
| 227 | struct nd_cmd_ars_status *ars_status; | 226 | struct nd_cmd_ars_status *ars_status; |
| 228 | struct nfit_spa *scrub_spa; | 227 | struct nfit_spa *scrub_spa; |
| 229 | struct delayed_work dwork; | 228 | struct delayed_work dwork; |
