aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-07-14 19:19:55 -0400
committerDan Williams <dan.j.williams@intel.com>2016-07-21 17:12:18 -0400
commite7a11b449e6e2e2caadf6792c7afeecd68800651 (patch)
tree328f3da582b1680ce5be40b11cd075255e385b05 /tools
parent3193204149de4d563519d6847aba638bb4d9662b (diff)
nfit: cleanup acpi_nfit_init calling convention
Pass the nfit buffer as a parameter rather than hanging it off of acpi_desc. Reviewed-by: "Lee, Chun-Yi" <jlee@suse.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/nvdimm/test/nfit.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index f458ba906f13..78cba1e3b1da 100644
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -1460,7 +1460,6 @@ static int nfit_test_probe(struct platform_device *pdev)
1460 nfit_test->setup(nfit_test); 1460 nfit_test->setup(nfit_test);
1461 acpi_desc = &nfit_test->acpi_desc; 1461 acpi_desc = &nfit_test->acpi_desc;
1462 acpi_nfit_desc_init(acpi_desc, &pdev->dev); 1462 acpi_nfit_desc_init(acpi_desc, &pdev->dev);
1463 acpi_desc->nfit = nfit_test->nfit_buf;
1464 acpi_desc->blk_do_io = nfit_test_blk_do_io; 1463 acpi_desc->blk_do_io = nfit_test_blk_do_io;
1465 nd_desc = &acpi_desc->nd_desc; 1464 nd_desc = &acpi_desc->nd_desc;
1466 nd_desc->provider_name = NULL; 1465 nd_desc->provider_name = NULL;
@@ -1469,7 +1468,8 @@ static int nfit_test_probe(struct platform_device *pdev)
1469 if (!acpi_desc->nvdimm_bus) 1468 if (!acpi_desc->nvdimm_bus)
1470 return -ENXIO; 1469 return -ENXIO;
1471 1470
1472 rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_size); 1471 rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_buf,
1472 nfit_test->nfit_size);
1473 if (rc) { 1473 if (rc) {
1474 nvdimm_bus_unregister(acpi_desc->nvdimm_bus); 1474 nvdimm_bus_unregister(acpi_desc->nvdimm_bus);
1475 return rc; 1475 return rc;
@@ -1481,7 +1481,8 @@ static int nfit_test_probe(struct platform_device *pdev)
1481 nfit_test->setup_hotplug = 1; 1481 nfit_test->setup_hotplug = 1;
1482 nfit_test->setup(nfit_test); 1482 nfit_test->setup(nfit_test);
1483 1483
1484 rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_size); 1484 rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_buf,
1485 nfit_test->nfit_size);
1485 if (rc) { 1486 if (rc) {
1486 nvdimm_bus_unregister(acpi_desc->nvdimm_bus); 1487 nvdimm_bus_unregister(acpi_desc->nvdimm_bus);
1487 return rc; 1488 return rc;