git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
capi
/
capi.c
diff --git
a/drivers/isdn/capi/capi.c
b/drivers/isdn/capi/capi.c
index
669f763
..
d22c022
100644
(file)
--- a/
drivers/isdn/capi/capi.c
+++ b/
drivers/isdn/capi/capi.c
@@
-215,13
+215,12
@@
static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
unsigned int minor = 0;
unsigned long flags;
unsigned int minor = 0;
unsigned long flags;
- mp = k
m
alloc(sizeof(*mp), GFP_ATOMIC);
+ mp = k
z
alloc(sizeof(*mp), GFP_ATOMIC);
if (!mp) {
printk(KERN_ERR "capi: can't alloc capiminor\n");
return NULL;
}
if (!mp) {
printk(KERN_ERR "capi: can't alloc capiminor\n");
return NULL;
}
- memset(mp, 0, sizeof(struct capiminor));
mp->ap = ap;
mp->ncci = ncci;
mp->msgid = 0;
mp->ap = ap;
mp->ncci = ncci;
mp->msgid = 0;
@@
-304,10
+303,9
@@
static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
struct capiminor *mp = NULL;
#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
struct capiminor *mp = NULL;
#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
- np = k
m
alloc(sizeof(*np), GFP_ATOMIC);
+ np = k
z
alloc(sizeof(*np), GFP_ATOMIC);
if (!np)
return NULL;
if (!np)
return NULL;
- memset(np, 0, sizeof(struct capincci));
np->ncci = ncci;
np->cdev = cdev;
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
np->ncci = ncci;
np->cdev = cdev;
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
@@
-384,10
+382,9
@@
static struct capidev *capidev_alloc(void)
struct capidev *cdev;
unsigned long flags;
struct capidev *cdev;
unsigned long flags;
- cdev = k
m
alloc(sizeof(*cdev), GFP_KERNEL);
+ cdev = k
z
alloc(sizeof(*cdev), GFP_KERNEL);
if (!cdev)
return NULL;
if (!cdev)
return NULL;
- memset(cdev, 0, sizeof(struct capidev));
init_MUTEX(&cdev->ncci_list_sem);
skb_queue_head_init(&cdev->recvqueue);
init_MUTEX(&cdev->ncci_list_sem);
skb_queue_head_init(&cdev->recvqueue);
@@
-1010,7
+1007,7
@@
static int capinc_tty_open(struct tty_struct * tty, struct file * file)
{
struct capiminor *mp;
{
struct capiminor *mp;
- if ((mp = capiminor_find(iminor(file->f_dentry->d_inode))) == 0)
+ if ((mp = capiminor_find(iminor(file->f_
path.
dentry->d_inode))) == 0)
return -ENXIO;
if (mp->nccip == 0)
return -ENXIO;
return -ENXIO;
if (mp->nccip == 0)
return -ENXIO;
@@
-1203,7
+1200,7
@@
static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file,
return error;
}
return error;
}
-static void capinc_tty_set_termios(struct tty_struct *tty, struct termios * old)
+static void capinc_tty_set_termios(struct tty_struct *tty, struct
k
termios * old)
{
#ifdef _DEBUG_TTYFUNCS
printk(KERN_DEBUG "capinc_tty_set_termios\n");
{
#ifdef _DEBUG_TTYFUNCS
printk(KERN_DEBUG "capinc_tty_set_termios\n");
@@
-1298,7
+1295,7
@@
static int capinc_tty_read_proc(char *page, char **start, off_t off,
static struct tty_driver *capinc_tty_driver;
static struct tty_driver *capinc_tty_driver;
-static struct tty_operations capinc_ops = {
+static
const
struct tty_operations capinc_ops = {
.open = capinc_tty_open,
.close = capinc_tty_close,
.write = capinc_tty_write,
.open = capinc_tty_open,
.close = capinc_tty_close,
.write = capinc_tty_write,