|
@@ -504,7 +504,6 @@ static int stl_echmcaintr(stlbrd_t *brdp);
|
|
|
static int stl_echpciintr(stlbrd_t *brdp);
|
|
|
static int stl_echpci64intr(stlbrd_t *brdp);
|
|
|
static void stl_offintr(void *private);
|
|
|
-static void *stl_memalloc(int len);
|
|
|
static stlbrd_t *stl_allocbrd(void);
|
|
|
static stlport_t *stl_getport(int brdnr, int panelnr, int portnr);
|
|
|
|
|
@@ -939,17 +938,6 @@ static int stl_parsebrd(stlconf_t *confp, char **argp)
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
-/*
|
|
|
- * Local driver kernel memory allocation routine.
|
|
|
- */
|
|
|
-
|
|
|
-static void *stl_memalloc(int len)
|
|
|
-{
|
|
|
- return (void *) kmalloc(len, GFP_KERNEL);
|
|
|
-}
|
|
|
-
|
|
|
-/*****************************************************************************/
|
|
|
-
|
|
|
/*
|
|
|
* Allocate a new board structure. Fill out the basic info in it.
|
|
|
*/
|
|
@@ -958,14 +946,13 @@ static stlbrd_t *stl_allocbrd(void)
|
|
|
{
|
|
|
stlbrd_t *brdp;
|
|
|
|
|
|
- brdp = (stlbrd_t *) stl_memalloc(sizeof(stlbrd_t));
|
|
|
- if (brdp == (stlbrd_t *) NULL) {
|
|
|
+ brdp = kzalloc(sizeof(stlbrd_t), GFP_KERNEL);
|
|
|
+ if (!brdp) {
|
|
|
printk("STALLION: failed to allocate memory (size=%d)\n",
|
|
|
sizeof(stlbrd_t));
|
|
|
- return (stlbrd_t *) NULL;
|
|
|
+ return NULL;
|
|
|
}
|
|
|
|
|
|
- memset(brdp, 0, sizeof(stlbrd_t));
|
|
|
brdp->magic = STL_BOARDMAGIC;
|
|
|
return brdp;
|
|
|
}
|
|
@@ -1017,9 +1004,9 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
|
|
|
portp->refcount++;
|
|
|
|
|
|
if ((portp->flags & ASYNC_INITIALIZED) == 0) {
|
|
|
- if (portp->tx.buf == (char *) NULL) {
|
|
|
- portp->tx.buf = (char *) stl_memalloc(STL_TXBUFSIZE);
|
|
|
- if (portp->tx.buf == (char *) NULL)
|
|
|
+ if (!portp->tx.buf) {
|
|
|
+ portp->tx.buf = kmalloc(STL_TXBUFSIZE, GFP_KERNEL);
|
|
|
+ if (!portp->tx.buf)
|
|
|
return -ENOMEM;
|
|
|
portp->tx.head = portp->tx.buf;
|
|
|
portp->tx.tail = portp->tx.buf;
|
|
@@ -2178,13 +2165,12 @@ static int __init stl_initports(stlbrd_t *brdp, stlpanel_t *panelp)
|
|
|
* each ports data structures.
|
|
|
*/
|
|
|
for (i = 0; (i < panelp->nrports); i++) {
|
|
|
- portp = (stlport_t *) stl_memalloc(sizeof(stlport_t));
|
|
|
- if (portp == (stlport_t *) NULL) {
|
|
|
+ portp = kzalloc(sizeof(stlport_t), GFP_KERNEL);
|
|
|
+ if (!portp) {
|
|
|
printk("STALLION: failed to allocate memory "
|
|
|
"(size=%d)\n", sizeof(stlport_t));
|
|
|
break;
|
|
|
}
|
|
|
- memset(portp, 0, sizeof(stlport_t));
|
|
|
|
|
|
portp->magic = STL_PORTMAGIC;
|
|
|
portp->portnr = i;
|
|
@@ -2315,13 +2301,12 @@ static inline int stl_initeio(stlbrd_t *brdp)
|
|
|
* can complete the setup.
|
|
|
*/
|
|
|
|
|
|
- panelp = (stlpanel_t *) stl_memalloc(sizeof(stlpanel_t));
|
|
|
- if (panelp == (stlpanel_t *) NULL) {
|
|
|
+ panelp = kzalloc(sizeof(stlpanel_t), GFP_KERNEL);
|
|
|
+ if (!panelp) {
|
|
|
printk(KERN_WARNING "STALLION: failed to allocate memory "
|
|
|
"(size=%d)\n", sizeof(stlpanel_t));
|
|
|
- return(-ENOMEM);
|
|
|
+ return -ENOMEM;
|
|
|
}
|
|
|
- memset(panelp, 0, sizeof(stlpanel_t));
|
|
|
|
|
|
panelp->magic = STL_PANELMAGIC;
|
|
|
panelp->brdnr = brdp->brdnr;
|
|
@@ -2490,13 +2475,12 @@ static inline int stl_initech(stlbrd_t *brdp)
|
|
|
status = inb(ioaddr + ECH_PNLSTATUS);
|
|
|
if ((status & ECH_PNLIDMASK) != nxtid)
|
|
|
break;
|
|
|
- panelp = (stlpanel_t *) stl_memalloc(sizeof(stlpanel_t));
|
|
|
- if (panelp == (stlpanel_t *) NULL) {
|
|
|
+ panelp = kzalloc(sizeof(stlpanel_t), GFP_KERNEL);
|
|
|
+ if (!panelp) {
|
|
|
printk("STALLION: failed to allocate memory "
|
|
|
"(size=%d)\n", sizeof(stlpanel_t));
|
|
|
break;
|
|
|
}
|
|
|
- memset(panelp, 0, sizeof(stlpanel_t));
|
|
|
panelp->magic = STL_PANELMAGIC;
|
|
|
panelp->brdnr = brdp->brdnr;
|
|
|
panelp->panelnr = panelnr;
|
|
@@ -3074,8 +3058,8 @@ static int __init stl_init(void)
|
|
|
/*
|
|
|
* Allocate a temporary write buffer.
|
|
|
*/
|
|
|
- stl_tmpwritebuf = (char *) stl_memalloc(STL_TXBUFSIZE);
|
|
|
- if (stl_tmpwritebuf == (char *) NULL)
|
|
|
+ stl_tmpwritebuf = kmalloc(STL_TXBUFSIZE, GFP_KERNEL);
|
|
|
+ if (!stl_tmpwritebuf)
|
|
|
printk("STALLION: failed to allocate memory (size=%d)\n",
|
|
|
STL_TXBUFSIZE);
|
|
|
|