projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-7570 into release branch
[powerpc.git]
/
drivers
/
atm
/
adummy.c
diff --git
a/drivers/atm/adummy.c
b/drivers/atm/adummy.c
index
d15c194
..
8d60c4e
100644
(file)
--- a/
drivers/atm/adummy.c
+++ b/
drivers/atm/adummy.c
@@
-2,7
+2,6
@@
* adummy.c: a dummy ATM driver
*/
* adummy.c: a dummy ATM driver
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/kernel.h>
@@
-14,7
+13,6
@@
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/mm.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>
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <asm/io.h>
@@
-114,16
+112,14
@@
static int __init adummy_init(void)
printk(KERN_ERR "adummy: version %s\n", DRV_VERSION);
printk(KERN_ERR "adummy: version %s\n", DRV_VERSION);
- adummy_dev =
(struct adummy_dev *) km
alloc(sizeof(struct adummy_dev),
+ adummy_dev =
kz
alloc(sizeof(struct adummy_dev),
GFP_KERNEL);
if (!adummy_dev) {
GFP_KERNEL);
if (!adummy_dev) {
- printk(KERN_ERR DEV_LABEL ": k
m
alloc() failed\n");
+ printk(KERN_ERR DEV_LABEL ": k
z
alloc() failed\n");
err = -ENOMEM;
goto out;
}
err = -ENOMEM;
goto out;
}
- memset(adummy_dev, 0, sizeof(struct adummy_dev));
-
- atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, 0);
+ atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL);
if (!atm_dev) {
printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");
err = -ENODEV;
if (!atm_dev) {
printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");
err = -ENODEV;