]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
char: Convert vmalloc/memset to vzalloc
authorJoe Perches <joe@perches.com>
Sat, 28 May 2011 17:36:25 +0000 (10:36 -0700)
committerJiri Kosina <jkosina@suse.cz>
Thu, 15 Sep 2011 11:55:03 +0000 (13:55 +0200)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/char/agp/backend.c
drivers/char/raw.c

index f27d0d0816d3ce5371a9948bc9841e74ba0f533b..4b71647782d03d16c38dd1cb319ed396daa9844c 100644 (file)
@@ -171,7 +171,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
        }
        got_gatt = 1;
 
-       bridge->key_list = vmalloc(PAGE_SIZE * 4);
+       bridge->key_list = vzalloc(PAGE_SIZE * 4);
        if (bridge->key_list == NULL) {
                dev_err(&bridge->dev->dev,
                        "can't allocate memory for key lists\n");
@@ -181,7 +181,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
        got_keylist = 1;
 
        /* FIXME vmalloc'd memory not guaranteed contiguous */
-       memset(bridge->key_list, 0, PAGE_SIZE * 4);
 
        if (bridge->driver->configure()) {
                dev_err(&bridge->dev->dev, "error configuring host chipset\n");
index b33e8ea314ed0182e746d547e020933e053e5b03..b6de2c0471458d6c9191d32bbad740de904f1ed1 100644 (file)
@@ -324,13 +324,12 @@ static int __init raw_init(void)
                max_raw_minors = MAX_RAW_MINORS;
        }
 
-       raw_devices = vmalloc(sizeof(struct raw_device_data) * max_raw_minors);
+       raw_devices = vzalloc(sizeof(struct raw_device_data) * max_raw_minors);
        if (!raw_devices) {
                printk(KERN_ERR "Not enough memory for raw device structures\n");
                ret = -ENOMEM;
                goto error;
        }
-       memset(raw_devices, 0, sizeof(struct raw_device_data) * max_raw_minors);
 
        ret = register_chrdev_region(dev, max_raw_minors, "raw");
        if (ret)