testing: nvdimm: make struct class structures constant

[linux-2.6-microblaze.git] / tools / testing / nvdimm / test / nfit.c

diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index 005043b..a61df34 100644 (file)
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -1712,7 +1712,9 @@ static void put_dimms(void *data)
                        device_unregister(t->dimm_dev[i]);
 }
 
-static struct class *nfit_test_dimm;
+static const struct class nfit_test_dimm = {
+       .name = "nfit_test_dimm",
+};
 
 static int dimm_name_to_id(struct device *dev)
 {
@@ -1830,7 +1832,7 @@ static int nfit_test_dimm_init(struct nfit_test *t)
        if (devm_add_action_or_reset(&t->pdev.dev, put_dimms, t))
                return -ENOMEM;
        for (i = 0; i < t->num_dcr; i++) {
-               t->dimm_dev[i] = device_create_with_groups(nfit_test_dimm,
+               t->dimm_dev[i] = device_create_with_groups(&nfit_test_dimm,
                                &t->pdev.dev, 0, NULL,
                                nfit_test_dimm_attribute_groups,
                                "test_dimm%d", i + t->dcr_idx);
@@ -3276,11 +3278,9 @@ static __init int nfit_test_init(void)
        if (!nfit_wq)
                return -ENOMEM;
 
-       nfit_test_dimm = class_create("nfit_test_dimm");
-       if (IS_ERR(nfit_test_dimm)) {
-               rc = PTR_ERR(nfit_test_dimm);
+       rc = class_register(&nfit_test_dimm);
+       if (rc)
                goto err_register;
-       }
 
        nfit_pool = gen_pool_create(ilog2(SZ_4M), NUMA_NO_NODE);
        if (!nfit_pool) {
@@ -3377,7 +3377,7 @@ static __exit void nfit_test_exit(void)
 
        for (i = 0; i < NUM_NFITS; i++)
                put_device(&instances[i]->pdev.dev);
-       class_destroy(nfit_test_dimm);
+       class_unregister(&nfit_test_dimm);
 }
 
 module_init(nfit_test_init);