projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[powerpc.git]
/
drivers
/
char
/
istallion.c
diff --git
a/drivers/char/istallion.c
b/drivers/char/istallion.c
index
e5247f8
..
ef20c1f
100644
(file)
--- a/
drivers/char/istallion.c
+++ b/
drivers/char/istallion.c
@@
-706,7
+706,6
@@
static int stli_portcmdstats(stliport_t *portp);
static int stli_clrportstats(stliport_t *portp, comstats_t __user *cp);
static int stli_getportstruct(stliport_t __user *arg);
static int stli_getbrdstruct(stlibrd_t __user *arg);
static int stli_clrportstats(stliport_t *portp, comstats_t __user *cp);
static int stli_getportstruct(stliport_t __user *arg);
static int stli_getbrdstruct(stlibrd_t __user *arg);
-static void *stli_memalloc(int len);
static stlibrd_t *stli_allocbrd(void);
static void stli_ecpinit(stlibrd_t *brdp);
static stlibrd_t *stli_allocbrd(void);
static void stli_ecpinit(stlibrd_t *brdp);
@@
-997,17
+996,6
@@
static int stli_parsebrd(stlconf_t *confp, char **argp)
/*****************************************************************************/
/*****************************************************************************/
-/*
- * Local driver kernel malloc routine.
- */
-
-static void *stli_memalloc(int len)
-{
- return((void *) kmalloc(len, GFP_KERNEL));
-}
-
-/*****************************************************************************/
-
static int stli_open(struct tty_struct *tty, struct file *filp)
{
stlibrd_t *brdp;
static int stli_open(struct tty_struct *tty, struct file *filp)
{
stlibrd_t *brdp;
@@
-3227,13
+3215,12
@@
static int stli_initports(stlibrd_t *brdp)
#endif
for (i = 0, panelnr = 0, panelport = 0; (i < brdp->nrports); i++) {
#endif
for (i = 0, panelnr = 0, panelport = 0; (i < brdp->nrports); i++) {
- portp =
(stliport_t *) stli_memalloc(sizeof(stliport_t)
);
- if (
portp == (stliport_t *) NULL
) {
+ portp =
kzalloc(sizeof(stliport_t), GFP_KERNEL
);
+ if (
!portp
) {
printk("STALLION: failed to allocate port structure\n");
continue;
}
printk("STALLION: failed to allocate port structure\n");
continue;
}
- memset(portp, 0, sizeof(stliport_t));
portp->magic = STLI_PORTMAGIC;
portp->portnr = i;
portp->brdnr = brdp->brdnr;
portp->magic = STLI_PORTMAGIC;
portp->portnr = i;
portp->brdnr = brdp->brdnr;
@@
-4610,14
+4597,13
@@
static stlibrd_t *stli_allocbrd(void)
{
stlibrd_t *brdp;
{
stlibrd_t *brdp;
- brdp =
(stlibrd_t *) stli_memalloc(sizeof(stlibrd_t)
);
- if (
brdp == (stlibrd_t *) NULL
) {
+ brdp =
kzalloc(sizeof(stlibrd_t), GFP_KERNEL
);
+ if (
!brdp
) {
printk(KERN_ERR "STALLION: failed to allocate memory "
"(size=%d)\n", sizeof(stlibrd_t));
printk(KERN_ERR "STALLION: failed to allocate memory "
"(size=%d)\n", sizeof(stlibrd_t));
- return
((stlibrd_t *) NULL)
;
+ return
NULL
;
}
}
- memset(brdp, 0, sizeof(stlibrd_t));
brdp->magic = STLI_BOARDMAGIC;
return(brdp);
}
brdp->magic = STLI_BOARDMAGIC;
return(brdp);
}
@@
-5210,12
+5196,12
@@
int __init stli_init(void)
/*
* Allocate a temporary write buffer.
*/
/*
* Allocate a temporary write buffer.
*/
- stli_tmpwritebuf =
(char *) stli_memalloc(STLI_TXBUFSIZE
);
- if (
stli_tmpwritebuf == (char *) NULL
)
+ stli_tmpwritebuf =
kmalloc(STLI_TXBUFSIZE, GFP_KERNEL
);
+ if (
!stli_tmpwritebuf
)
printk(KERN_ERR "STALLION: failed to allocate memory "
"(size=%d)\n", STLI_TXBUFSIZE);
printk(KERN_ERR "STALLION: failed to allocate memory "
"(size=%d)\n", STLI_TXBUFSIZE);
- stli_txcookbuf =
stli_memalloc(STLI_TXBUFSIZE
);
- if (
stli_txcookbuf == (char *) NULL
)
+ stli_txcookbuf =
kmalloc(STLI_TXBUFSIZE, GFP_KERNEL
);
+ if (
!stli_txcookbuf
)
printk(KERN_ERR "STALLION: failed to allocate memory "
"(size=%d)\n", STLI_TXBUFSIZE);
printk(KERN_ERR "STALLION: failed to allocate memory "
"(size=%d)\n", STLI_TXBUFSIZE);