Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / drivers / atm / adummy.c

diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index d1387cfe2d30e2ef96914dddd1e0f2ead5650c09..2ebd07f2ef81d33f1d9d5824b3b68085944616f3 100644 (file)
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -2,19 +2,16 @@
  * adummy.c: a dummy ATM driver
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
-#include <linux/pci.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <asm/io.h>
@@ -114,15 +111,13 @@ static int __init adummy_init(void)
 
        printk(KERN_ERR "adummy: version %s\n", DRV_VERSION);
 
-       adummy_dev = (struct adummy_dev *) kmalloc(sizeof(struct adummy_dev),
+       adummy_dev = kzalloc(sizeof(struct adummy_dev),
                                                   GFP_KERNEL);
        if (!adummy_dev) {
-               printk(KERN_ERR DEV_LABEL ": kmalloc() failed\n");
+               printk(KERN_ERR DEV_LABEL ": kzalloc() failed\n");
                err = -ENOMEM;
                goto out;
        }
-       memset(adummy_dev, 0, sizeof(struct adummy_dev));
-
        atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL);
        if (!atm_dev) {
                printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");