lib/genalloc.c: use vzalloc_node() to allocate the bitmap

[mirror_ubuntu-bionic-kernel.git] / lib / test_kmod.c

diff --git a/lib/test_kmod.c b/lib/test_kmod.c
index fba78d25e82569e57845d16b36c271d0848099b0..2fa9a62f4b1cb281af3f1d171d82167aec440a18 100644 (file)
--- a/lib/test_kmod.c
+++ b/lib/test_kmod.c
@@ -632,7 +632,7 @@ static void __kmod_config_free(struct test_config *config)
        config->test_driver = NULL;
 
        kfree_const(config->test_fs);
-       config->test_driver = NULL;
+       config->test_fs = NULL;
 }
 
 static void kmod_config_free(struct kmod_test_device *test_dev)
@@ -694,8 +694,7 @@ static ssize_t config_test_driver_show(struct device *dev,
        return config_test_show_str(&test_dev->config_mutex, buf,
                                    config->test_driver);
 }
-static DEVICE_ATTR(config_test_driver, 0644, config_test_driver_show,
-                  config_test_driver_store);
+static DEVICE_ATTR_RW(config_test_driver);
 
 static ssize_t config_test_fs_store(struct device *dev,
                                    struct device_attribute *attr,
@@ -726,8 +725,7 @@ static ssize_t config_test_fs_show(struct device *dev,
        return config_test_show_str(&test_dev->config_mutex, buf,
                                    config->test_fs);
 }
-static DEVICE_ATTR(config_test_fs, 0644, config_test_fs_show,
-                  config_test_fs_store);
+static DEVICE_ATTR_RW(config_test_fs);
 
 static int trigger_config_run_type(struct kmod_test_device *test_dev,
                                   enum kmod_test_case test_case,
@@ -783,10 +781,8 @@ static int kmod_config_sync_info(struct kmod_test_device *test_dev)
        free_test_dev_info(test_dev);
        test_dev->info = vzalloc(config->num_threads *
                                 sizeof(struct kmod_test_device_info));
-       if (!test_dev->info) {
-               dev_err(test_dev->dev, "Cannot alloc test_dev info\n");
+       if (!test_dev->info)
                return -ENOMEM;
-       }
 
        return 0;
 }
@@ -1014,8 +1010,7 @@ static ssize_t config_num_threads_show(struct device *dev,
 
        return test_dev_config_show_int(test_dev, buf, config->num_threads);
 }
-static DEVICE_ATTR(config_num_threads, 0644, config_num_threads_show,
-                  config_num_threads_store);
+static DEVICE_ATTR_RW(config_num_threads);
 
 static ssize_t config_test_case_store(struct device *dev,
                                      struct device_attribute *attr,
@@ -1039,8 +1034,7 @@ static ssize_t config_test_case_show(struct device *dev,
 
        return test_dev_config_show_uint(test_dev, buf, config->test_case);
 }
-static DEVICE_ATTR(config_test_case, 0644, config_test_case_show,
-                  config_test_case_store);
+static DEVICE_ATTR_RW(config_test_case);
 
 static ssize_t test_result_show(struct device *dev,
                                struct device_attribute *attr,
@@ -1051,7 +1045,7 @@ static ssize_t test_result_show(struct device *dev,
 
        return test_dev_config_show_int(test_dev, buf, config->test_result);
 }
-static DEVICE_ATTR(test_result, 0644, test_result_show, test_result_store);
+static DEVICE_ATTR_RW(test_result);
 
 #define TEST_KMOD_DEV_ATTR(name)               &dev_attr_##name.attr
 
@@ -1089,10 +1083,8 @@ static struct kmod_test_device *alloc_test_dev_kmod(int idx)
        struct miscdevice *misc_dev;
 
        test_dev = vzalloc(sizeof(struct kmod_test_device));
-       if (!test_dev) {
-               pr_err("Cannot alloc test_dev\n");
+       if (!test_dev)
                goto err_out;
-       }
 
        mutex_init(&test_dev->config_mutex);
        mutex_init(&test_dev->trigger_mutex);
@@ -1149,7 +1141,7 @@ static struct kmod_test_device *register_test_dev_kmod(void)
        mutex_lock(&reg_dev_mutex);
 
        /* int should suffice for number of devices, test for wrap */
-       if (unlikely(num_test_devs + 1) < 0) {
+       if (num_test_devs + 1 == INT_MAX) {
                pr_err("reached limit of number of test devices\n");
                goto out;
        }
@@ -1221,7 +1213,6 @@ void unregister_test_dev_kmod(struct kmod_test_device *test_dev)
 
        dev_info(test_dev->dev, "removing interface\n");
        misc_deregister(&test_dev->misc_dev);
-       kfree(&test_dev->misc_dev.name);
 
        mutex_unlock(&test_dev->config_mutex);
        mutex_unlock(&test_dev->trigger_mutex);