Skip to content

L
linux
Commit 615e4a71 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files
Options

[PATCH] Char: stallion, remove unneeded casts 

casts of NULL are unnecessary. And so casts to (void *) are.
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a0564e14
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 136 deletions
drivers/char/stallion.c
View file @ 615e4a71
...@@ -187,32 +187,32 @@ static stlbrd_t *stl_brds[STL_MAXBRDS]; ...@@ -187,32 +187,32 @@ static stlbrd_t *stl_brds[STL_MAXBRDS];
* referencing boards when printing trace and stuff. * referencing boards when printing trace and stuff.
*/ */
static char *stl_brdnames[] = { static char *stl_brdnames[] = {
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
"EasyIO", "EasyIO",
"EC8/32-AT", "EC8/32-AT",
"EC8/32-MC", "EC8/32-MC",
(char *) NULL, NULL,
(char *) NULL, NULL,
(char *) NULL, NULL,
"EC8/32-PCI", "EC8/32-PCI",
"EC8/64-PCI", "EC8/64-PCI",
"EasyIO-PCI", "EasyIO-PCI",
...@@ -761,20 +761,20 @@ static void __exit stallion_module_exit(void) ...@@ -761,20 +761,20 @@ static void __exit stallion_module_exit(void)
class_destroy(stallion_class); class_destroy(stallion_class);
for (i = 0; (i < stl_nrbrds); i++) { for (i = 0; (i < stl_nrbrds); i++) {
if ((brdp = stl_brds[i]) == (stlbrd_t *) NULL) if ((brdp = stl_brds[i]) == NULL)
continue; continue;
free_irq(brdp->irq, brdp); free_irq(brdp->irq, brdp);
for (j = 0; (j < STL_MAXPANELS); j++) { for (j = 0; (j < STL_MAXPANELS); j++) {
panelp = brdp->panels[j]; panelp = brdp->panels[j];
if (panelp == (stlpanel_t *) NULL) if (panelp == NULL)
continue; continue;
for (k = 0; (k < STL_PORTSPERPANEL); k++) { for (k = 0; (k < STL_PORTSPERPANEL); k++) {
portp = panelp->ports[k]; portp = panelp->ports[k];
if (portp == (stlport_t *) NULL) if (portp == NULL)
continue; continue;
if (portp->tty != (struct tty_struct *) NULL) if (portp->tty != NULL)
stl_hangup(portp->tty); stl_hangup(portp->tty);
kfree(portp->tx.buf); kfree(portp->tx.buf);
kfree(portp); kfree(portp);
...@@ -787,7 +787,7 @@ static void __exit stallion_module_exit(void) ...@@ -787,7 +787,7 @@ static void __exit stallion_module_exit(void)
release_region(brdp->ioaddr2, brdp->iosize2); release_region(brdp->ioaddr2, brdp->iosize2);
kfree(brdp); kfree(brdp);
stl_brds[i] = (stlbrd_t *) NULL; stl_brds[i] = NULL;
} }
} }
...@@ -812,7 +812,7 @@ static void stl_argbrds(void) ...@@ -812,7 +812,7 @@ static void stl_argbrds(void)
memset(&conf, 0, sizeof(conf)); memset(&conf, 0, sizeof(conf));
if (stl_parsebrd(&conf, stl_brdsp[i]) == 0) if (stl_parsebrd(&conf, stl_brdsp[i]) == 0)
continue; continue;
if ((brdp = stl_allocbrd()) == (stlbrd_t *) NULL) if ((brdp = stl_allocbrd()) == NULL)
continue; continue;
stl_nrbrds = i + 1; stl_nrbrds = i + 1;
brdp->brdnr = i; brdp->brdnr = i;
...@@ -874,7 +874,7 @@ static int stl_parsebrd(stlconf_t *confp, char **argp) ...@@ -874,7 +874,7 @@ static int stl_parsebrd(stlconf_t *confp, char **argp)
pr_debug("stl_parsebrd(confp=%p,argp=%p)\n", confp, argp); pr_debug("stl_parsebrd(confp=%p,argp=%p)\n", confp, argp);
if ((argp[0] == (char *) NULL) || (*argp[0] == 0)) if ((argp[0] == NULL) || (*argp[0] == 0))
return 0; return 0;
for (sp = argp[0], i = 0; ((*sp != 0) && (i < 25)); sp++, i++) for (sp = argp[0], i = 0; ((*sp != 0) && (i < 25)); sp++, i++)
...@@ -892,15 +892,15 @@ static int stl_parsebrd(stlconf_t *confp, char **argp) ...@@ -892,15 +892,15 @@ static int stl_parsebrd(stlconf_t *confp, char **argp)
confp->brdtype = stl_brdstr[i].type; confp->brdtype = stl_brdstr[i].type;
i = 1; i = 1;
if ((argp[i] != (char *) NULL) && (*argp[i] != 0)) if ((argp[i] != NULL) && (*argp[i] != 0))
confp->ioaddr1 = stl_atol(argp[i]); confp->ioaddr1 = stl_atol(argp[i]);
i++; i++;
if (confp->brdtype == BRD_ECH) { if (confp->brdtype == BRD_ECH) {
if ((argp[i] != (char *) NULL) && (*argp[i] != 0)) if ((argp[i] != NULL) && (*argp[i] != 0))
confp->ioaddr2 = stl_atol(argp[i]); confp->ioaddr2 = stl_atol(argp[i]);
i++; i++;
} }
if ((argp[i] != (char *) NULL) && (*argp[i] != 0)) if ((argp[i] != NULL) && (*argp[i] != 0))
confp->irq = stl_atol(argp[i]); confp->irq = stl_atol(argp[i]);
return 1; return 1;
} }
...@@ -942,11 +942,11 @@ static int stl_open(struct tty_struct *tty, struct file *filp) ...@@ -942,11 +942,11 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
if (brdnr >= stl_nrbrds) if (brdnr >= stl_nrbrds)
return -ENODEV; return -ENODEV;
brdp = stl_brds[brdnr]; brdp = stl_brds[brdnr];
if (brdp == (stlbrd_t *) NULL) if (brdp == NULL)
return -ENODEV; return -ENODEV;
minordev = MINOR2PORT(minordev); minordev = MINOR2PORT(minordev);
for (portnr = -1, panelnr = 0; (panelnr < STL_MAXPANELS); panelnr++) { for (portnr = -1, panelnr = 0; (panelnr < STL_MAXPANELS); panelnr++) {
if (brdp->panels[panelnr] == (stlpanel_t *) NULL) if (brdp->panels[panelnr] == NULL)
break; break;
if (minordev < brdp->panels[panelnr]->nrports) { if (minordev < brdp->panels[panelnr]->nrports) {
portnr = minordev; portnr = minordev;
...@@ -958,7 +958,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp) ...@@ -958,7 +958,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
return -ENODEV; return -ENODEV;
portp = brdp->panels[panelnr]->ports[portnr]; portp = brdp->panels[panelnr]->ports[portnr];
if (portp == (stlport_t *) NULL) if (portp == NULL)
return -ENODEV; return -ENODEV;
/* /*
...@@ -1080,7 +1080,7 @@ static void stl_close(struct tty_struct *tty, struct file *filp) ...@@ -1080,7 +1080,7 @@ static void stl_close(struct tty_struct *tty, struct file *filp)
pr_debug("stl_close(tty=%p,filp=%p)\n", tty, filp); pr_debug("stl_close(tty=%p,filp=%p)\n", tty, filp);
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
spin_lock_irqsave(&stallion_lock, flags); spin_lock_irqsave(&stallion_lock, flags);
...@@ -1123,17 +1123,17 @@ static void stl_close(struct tty_struct *tty, struct file *filp) ...@@ -1123,17 +1123,17 @@ static void stl_close(struct tty_struct *tty, struct file *filp)
stl_enablerxtx(portp, 0, 0); stl_enablerxtx(portp, 0, 0);
stl_flushbuffer(tty); stl_flushbuffer(tty);
portp->istate = 0; portp->istate = 0;
if (portp->tx.buf != (char *) NULL) { if (portp->tx.buf != NULL) {
kfree(portp->tx.buf); kfree(portp->tx.buf);
portp->tx.buf = (char *) NULL; portp->tx.buf = NULL;
portp->tx.head = (char *) NULL; portp->tx.head = NULL;
portp->tx.tail = (char *) NULL; portp->tx.tail = NULL;
} }
set_bit(TTY_IO_ERROR, &tty->flags); set_bit(TTY_IO_ERROR, &tty->flags);
tty_ldisc_flush(tty); tty_ldisc_flush(tty);
tty->closing = 0; tty->closing = 0;
portp->tty = (struct tty_struct *) NULL; portp->tty = NULL;
if (portp->openwaitcnt) { if (portp->openwaitcnt) {
if (portp->close_delay) if (portp->close_delay)
...@@ -1162,9 +1162,9 @@ static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count ...@@ -1162,9 +1162,9 @@ static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count
pr_debug("stl_write(tty=%p,buf=%p,count=%d)\n", tty, buf, count); pr_debug("stl_write(tty=%p,buf=%p,count=%d)\n", tty, buf, count);
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return 0; return 0;
if (portp->tx.buf == (char *) NULL) if (portp->tx.buf == NULL)
return 0; return 0;
/* /*
...@@ -1217,12 +1217,12 @@ static void stl_putchar(struct tty_struct *tty, unsigned char ch) ...@@ -1217,12 +1217,12 @@ static void stl_putchar(struct tty_struct *tty, unsigned char ch)
pr_debug("stl_putchar(tty=%p,ch=%x)\n", tty, ch); pr_debug("stl_putchar(tty=%p,ch=%x)\n", tty, ch);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
if (portp->tx.buf == (char *) NULL) if (portp->tx.buf == NULL)
return; return;
head = portp->tx.head; head = portp->tx.head;
...@@ -1253,12 +1253,12 @@ static void stl_flushchars(struct tty_struct *tty) ...@@ -1253,12 +1253,12 @@ static void stl_flushchars(struct tty_struct *tty)
pr_debug("stl_flushchars(tty=%p)\n", tty); pr_debug("stl_flushchars(tty=%p)\n", tty);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
if (portp->tx.buf == (char *) NULL) if (portp->tx.buf == NULL)
return; return;
stl_startrxtx(portp, -1, 1); stl_startrxtx(portp, -1, 1);
...@@ -1273,12 +1273,12 @@ static int stl_writeroom(struct tty_struct *tty) ...@@ -1273,12 +1273,12 @@ static int stl_writeroom(struct tty_struct *tty)
pr_debug("stl_writeroom(tty=%p)\n", tty); pr_debug("stl_writeroom(tty=%p)\n", tty);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return 0; return 0;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return 0; return 0;
if (portp->tx.buf == (char *) NULL) if (portp->tx.buf == NULL)
return 0; return 0;
head = portp->tx.head; head = portp->tx.head;
...@@ -1305,12 +1305,12 @@ static int stl_charsinbuffer(struct tty_struct *tty) ...@@ -1305,12 +1305,12 @@ static int stl_charsinbuffer(struct tty_struct *tty)
pr_debug("stl_charsinbuffer(tty=%p)\n", tty); pr_debug("stl_charsinbuffer(tty=%p)\n", tty);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return 0; return 0;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return 0; return 0;
if (portp->tx.buf == (char *) NULL) if (portp->tx.buf == NULL)
return 0; return 0;
head = portp->tx.head; head = portp->tx.head;
...@@ -1352,7 +1352,7 @@ static int stl_getserial(stlport_t *portp, struct serial_struct __user *sp) ...@@ -1352,7 +1352,7 @@ static int stl_getserial(stlport_t *portp, struct serial_struct __user *sp)
} }
brdp = stl_brds[portp->brdnr]; brdp = stl_brds[portp->brdnr];
if (brdp != (stlbrd_t *) NULL) if (brdp != NULL)
sio.irq = brdp->irq; sio.irq = brdp->irq;
return copy_to_user(sp, &sio, sizeof(struct serial_struct)) ? -EFAULT : 0; return copy_to_user(sp, &sio, sizeof(struct serial_struct)) ? -EFAULT : 0;
...@@ -1398,10 +1398,10 @@ static int stl_tiocmget(struct tty_struct *tty, struct file *file) ...@@ -1398,10 +1398,10 @@ static int stl_tiocmget(struct tty_struct *tty, struct file *file)
{ {
stlport_t *portp; stlport_t *portp;
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return -ENODEV; return -ENODEV;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return -ENODEV; return -ENODEV;
if (tty->flags & (1 << TTY_IO_ERROR)) if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO; return -EIO;
...@@ -1415,10 +1415,10 @@ static int stl_tiocmset(struct tty_struct *tty, struct file *file, ...@@ -1415,10 +1415,10 @@ static int stl_tiocmset(struct tty_struct *tty, struct file *file,
stlport_t *portp; stlport_t *portp;
int rts = -1, dtr = -1; int rts = -1, dtr = -1;
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return -ENODEV; return -ENODEV;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return -ENODEV; return -ENODEV;
if (tty->flags & (1 << TTY_IO_ERROR)) if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO; return -EIO;
...@@ -1446,10 +1446,10 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd ...@@ -1446,10 +1446,10 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd
pr_debug("stl_ioctl(tty=%p,file=%p,cmd=%x,arg=%lx)\n", tty, file, cmd, pr_debug("stl_ioctl(tty=%p,file=%p,cmd=%x,arg=%lx)\n", tty, file, cmd,
arg); arg);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return -ENODEV; return -ENODEV;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return -ENODEV; return -ENODEV;
if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
...@@ -1508,10 +1508,10 @@ static void stl_settermios(struct tty_struct *tty, struct termios *old) ...@@ -1508,10 +1508,10 @@ static void stl_settermios(struct tty_struct *tty, struct termios *old)
pr_debug("stl_settermios(tty=%p,old=%p)\n", tty, old); pr_debug("stl_settermios(tty=%p,old=%p)\n", tty, old);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
tiosp = tty->termios; tiosp = tty->termios;
...@@ -1543,10 +1543,10 @@ static void stl_throttle(struct tty_struct *tty) ...@@ -1543,10 +1543,10 @@ static void stl_throttle(struct tty_struct *tty)
pr_debug("stl_throttle(tty=%p)\n", tty); pr_debug("stl_throttle(tty=%p)\n", tty);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
stl_flowctrl(portp, 0); stl_flowctrl(portp, 0);
} }
...@@ -1563,10 +1563,10 @@ static void stl_unthrottle(struct tty_struct *tty) ...@@ -1563,10 +1563,10 @@ static void stl_unthrottle(struct tty_struct *tty)
pr_debug("stl_unthrottle(tty=%p)\n", tty); pr_debug("stl_unthrottle(tty=%p)\n", tty);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
stl_flowctrl(portp, 1); stl_flowctrl(portp, 1);
} }
...@@ -1584,10 +1584,10 @@ static void stl_stop(struct tty_struct *tty) ...@@ -1584,10 +1584,10 @@ static void stl_stop(struct tty_struct *tty)
pr_debug("stl_stop(tty=%p)\n", tty); pr_debug("stl_stop(tty=%p)\n", tty);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
stl_startrxtx(portp, -1, 0); stl_startrxtx(portp, -1, 0);
} }
...@@ -1604,10 +1604,10 @@ static void stl_start(struct tty_struct *tty) ...@@ -1604,10 +1604,10 @@ static void stl_start(struct tty_struct *tty)
pr_debug("stl_start(tty=%p)\n", tty); pr_debug("stl_start(tty=%p)\n", tty);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
stl_startrxtx(portp, -1, 1); stl_startrxtx(portp, -1, 1);
} }
...@@ -1626,10 +1626,10 @@ static void stl_hangup(struct tty_struct *tty) ...@@ -1626,10 +1626,10 @@ static void stl_hangup(struct tty_struct *tty)
pr_debug("stl_hangup(tty=%p)\n", tty); pr_debug("stl_hangup(tty=%p)\n", tty);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
portp->flags &= ~ASYNC_INITIALIZED; portp->flags &= ~ASYNC_INITIALIZED;
...@@ -1640,13 +1640,13 @@ static void stl_hangup(struct tty_struct *tty) ...@@ -1640,13 +1640,13 @@ static void stl_hangup(struct tty_struct *tty)
stl_flushbuffer(tty); stl_flushbuffer(tty);
portp->istate = 0; portp->istate = 0;
set_bit(TTY_IO_ERROR, &tty->flags); set_bit(TTY_IO_ERROR, &tty->flags);
if (portp->tx.buf != (char *) NULL) { if (portp->tx.buf != NULL) {
kfree(portp->tx.buf); kfree(portp->tx.buf);
portp->tx.buf = (char *) NULL; portp->tx.buf = NULL;
portp->tx.head = (char *) NULL; portp->tx.head = NULL;
portp->tx.tail = (char *) NULL; portp->tx.tail = NULL;
} }
portp->tty = (struct tty_struct *) NULL; portp->tty = NULL;
portp->flags &= ~ASYNC_NORMAL_ACTIVE; portp->flags &= ~ASYNC_NORMAL_ACTIVE;
portp->refcount = 0; portp->refcount = 0;
wake_up_interruptible(&portp->open_wait); wake_up_interruptible(&portp->open_wait);
...@@ -1660,10 +1660,10 @@ static void stl_flushbuffer(struct tty_struct *tty) ...@@ -1660,10 +1660,10 @@ static void stl_flushbuffer(struct tty_struct *tty)
pr_debug("stl_flushbuffer(tty=%p)\n", tty); pr_debug("stl_flushbuffer(tty=%p)\n", tty);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
stl_flush(portp); stl_flush(portp);
...@@ -1678,10 +1678,10 @@ static void stl_breakctl(struct tty_struct *tty, int state) ...@@ -1678,10 +1678,10 @@ static void stl_breakctl(struct tty_struct *tty, int state)
pr_debug("stl_breakctl(tty=%p,state=%d)\n", tty, state); pr_debug("stl_breakctl(tty=%p,state=%d)\n", tty, state);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
stl_sendbreak(portp, ((state == -1) ? 1 : 2)); stl_sendbreak(portp, ((state == -1) ? 1 : 2));
...@@ -1696,10 +1696,10 @@ static void stl_waituntilsent(struct tty_struct *tty, int timeout) ...@@ -1696,10 +1696,10 @@ static void stl_waituntilsent(struct tty_struct *tty, int timeout)
pr_debug("stl_waituntilsent(tty=%p,timeout=%d)\n", tty, timeout); pr_debug("stl_waituntilsent(tty=%p,timeout=%d)\n", tty, timeout);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
if (timeout == 0) if (timeout == 0)
...@@ -1723,10 +1723,10 @@ static void stl_sendxchar(struct tty_struct *tty, char ch) ...@@ -1723,10 +1723,10 @@ static void stl_sendxchar(struct tty_struct *tty, char ch)
pr_debug("stl_sendxchar(tty=%p,ch=%x)\n", tty, ch); pr_debug("stl_sendxchar(tty=%p,ch=%x)\n", tty, ch);
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
portp = tty->driver_data; portp = tty->driver_data;
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
if (ch == STOP_CHAR(tty)) if (ch == STOP_CHAR(tty))
...@@ -1822,7 +1822,7 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof ...@@ -1822,7 +1822,7 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof
*/ */
for (brdnr = 0; (brdnr < stl_nrbrds); brdnr++) { for (brdnr = 0; (brdnr < stl_nrbrds); brdnr++) {
brdp = stl_brds[brdnr]; brdp = stl_brds[brdnr];
if (brdp == (stlbrd_t *) NULL) if (brdp == NULL)
continue; continue;
if (brdp->state == 0) if (brdp->state == 0)
continue; continue;
...@@ -1836,7 +1836,7 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof ...@@ -1836,7 +1836,7 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof
totalport = brdnr * STL_MAXPORTS; totalport = brdnr * STL_MAXPORTS;
for (panelnr = 0; (panelnr < brdp->nrpanels); panelnr++) { for (panelnr = 0; (panelnr < brdp->nrpanels); panelnr++) {
panelp = brdp->panels[panelnr]; panelp = brdp->panels[panelnr];
if (panelp == (stlpanel_t *) NULL) if (panelp == NULL)
continue; continue;
maxoff = curoff + (panelp->nrports * MAXLINE); maxoff = curoff + (panelp->nrports * MAXLINE);
...@@ -1849,7 +1849,7 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof ...@@ -1849,7 +1849,7 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof
for (portnr = 0; (portnr < panelp->nrports); portnr++, for (portnr = 0; (portnr < panelp->nrports); portnr++,
totalport++) { totalport++) {
portp = panelp->ports[portnr]; portp = panelp->ports[portnr];
if (portp == (stlport_t *) NULL) if (portp == NULL)
continue; continue;
if (off >= (curoff += MAXLINE)) if (off >= (curoff += MAXLINE))
continue; continue;
...@@ -1876,7 +1876,7 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof ...@@ -1876,7 +1876,7 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof
static irqreturn_t stl_intr(int irq, void *dev_id) static irqreturn_t stl_intr(int irq, void *dev_id)
{ {
stlbrd_t *brdp = (stlbrd_t *) dev_id; stlbrd_t *brdp = dev_id;
pr_debug("stl_intr(brdp=%p,irq=%d)\n", brdp, irq); pr_debug("stl_intr(brdp=%p,irq=%d)\n", brdp, irq);
...@@ -2034,11 +2034,11 @@ static void stl_offintr(struct work_struct *work) ...@@ -2034,11 +2034,11 @@ static void stl_offintr(struct work_struct *work)
pr_debug("stl_offintr(portp=%p)\n", portp); pr_debug("stl_offintr(portp=%p)\n", portp);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
tty = portp->tty; tty = portp->tty;
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
lock_kernel(); lock_kernel();
...@@ -2227,10 +2227,10 @@ static inline int stl_initeio(stlbrd_t *brdp) ...@@ -2227,10 +2227,10 @@ static inline int stl_initeio(stlbrd_t *brdp)
panelp->iobase = brdp->ioaddr1; panelp->iobase = brdp->ioaddr1;
panelp->hwid = status; panelp->hwid = status;
if ((status & EIO_IDBITMASK) == EIO_MK3) { if ((status & EIO_IDBITMASK) == EIO_MK3) {
panelp->uartp = (void *) &stl_sc26198uart; panelp->uartp = &stl_sc26198uart;
panelp->isr = stl_sc26198intr; panelp->isr = stl_sc26198intr;
} else { } else {
panelp->uartp = (void *) &stl_cd1400uart; panelp->uartp = &stl_cd1400uart;
panelp->isr = stl_cd1400eiointr; panelp->isr = stl_cd1400eiointr;
} }
...@@ -2402,7 +2402,7 @@ static inline int stl_initech(stlbrd_t *brdp) ...@@ -2402,7 +2402,7 @@ static inline int stl_initech(stlbrd_t *brdp)
brdp->bnkstataddr[banknr++] = ioaddr + ECH_PNLSTATUS; brdp->bnkstataddr[banknr++] = ioaddr + ECH_PNLSTATUS;
if (status & ECH_PNLXPID) { if (status & ECH_PNLXPID) {
panelp->uartp = (void *) &stl_sc26198uart; panelp->uartp = &stl_sc26198uart;
panelp->isr = stl_sc26198intr; panelp->isr = stl_sc26198intr;
if (status & ECH_PNL16PORT) { if (status & ECH_PNL16PORT) {
panelp->nrports = 16; panelp->nrports = 16;
...@@ -2414,7 +2414,7 @@ static inline int stl_initech(stlbrd_t *brdp) ...@@ -2414,7 +2414,7 @@ static inline int stl_initech(stlbrd_t *brdp)
panelp->nrports = 8; panelp->nrports = 8;
} }
} else { } else {
panelp->uartp = (void *) &stl_cd1400uart; panelp->uartp = &stl_cd1400uart;
panelp->isr = stl_cd1400echintr; panelp->isr = stl_cd1400echintr;
if (status & ECH_PNL16PORT) { if (status & ECH_PNL16PORT) {
panelp->nrports = 16; panelp->nrports = 16;
...@@ -2498,7 +2498,7 @@ static int __init stl_brdinit(stlbrd_t *brdp) ...@@ -2498,7 +2498,7 @@ static int __init stl_brdinit(stlbrd_t *brdp)
} }
for (i = 0; (i < STL_MAXPANELS); i++) for (i = 0; (i < STL_MAXPANELS); i++)
if (brdp->panels[i] != (stlpanel_t *) NULL) if (brdp->panels[i] != NULL)
stl_initports(brdp, brdp->panels[i]); stl_initports(brdp, brdp->panels[i]);
printk("STALLION: %s found, board=%d io=%x irq=%d " printk("STALLION: %s found, board=%d io=%x irq=%d "
...@@ -2519,7 +2519,7 @@ static inline int stl_getbrdnr(void) ...@@ -2519,7 +2519,7 @@ static inline int stl_getbrdnr(void)
int i; int i;
for (i = 0; (i < STL_MAXBRDS); i++) { for (i = 0; (i < STL_MAXBRDS); i++) {
if (stl_brds[i] == (stlbrd_t *) NULL) { if (stl_brds[i] == NULL) {
if (i >= stl_nrbrds) if (i >= stl_nrbrds)
stl_nrbrds = i + 1; stl_nrbrds = i + 1;
return(i); return(i);
...@@ -2547,7 +2547,7 @@ static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp) ...@@ -2547,7 +2547,7 @@ static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp)
if (pci_enable_device(devp)) if (pci_enable_device(devp))
return(-EIO); return(-EIO);
if ((brdp = stl_allocbrd()) == (stlbrd_t *) NULL) if ((brdp = stl_allocbrd()) == NULL)
return(-ENOMEM); return(-ENOMEM);
if ((brdp->brdnr = stl_getbrdnr()) < 0) { if ((brdp->brdnr = stl_getbrdnr()) < 0) {
printk("STALLION: too many boards found, " printk("STALLION: too many boards found, "
...@@ -2657,7 +2657,7 @@ static inline int stl_initbrds(void) ...@@ -2657,7 +2657,7 @@ static inline int stl_initbrds(void)
for (i = 0; (i < stl_nrbrds); i++) { for (i = 0; (i < stl_nrbrds); i++) {
confp = &stl_brdconf[i]; confp = &stl_brdconf[i];
stl_parsebrd(confp, stl_brdsp[i]); stl_parsebrd(confp, stl_brdsp[i]);
if ((brdp = stl_allocbrd()) == (stlbrd_t *) NULL) if ((brdp = stl_allocbrd()) == NULL)
return(-ENOMEM); return(-ENOMEM);
brdp->brdnr = i; brdp->brdnr = i;
brdp->brdtype = confp->brdtype; brdp->brdtype = confp->brdtype;
...@@ -2697,7 +2697,7 @@ static int stl_getbrdstats(combrd_t __user *bp) ...@@ -2697,7 +2697,7 @@ static int stl_getbrdstats(combrd_t __user *bp)
if (stl_brdstats.brd >= STL_MAXBRDS) if (stl_brdstats.brd >= STL_MAXBRDS)
return(-ENODEV); return(-ENODEV);
brdp = stl_brds[stl_brdstats.brd]; brdp = stl_brds[stl_brdstats.brd];
if (brdp == (stlbrd_t *) NULL) if (brdp == NULL)
return(-ENODEV); return(-ENODEV);
memset(&stl_brdstats, 0, sizeof(combrd_t)); memset(&stl_brdstats, 0, sizeof(combrd_t));
...@@ -2732,17 +2732,17 @@ static stlport_t *stl_getport(int brdnr, int panelnr, int portnr) ...@@ -2732,17 +2732,17 @@ static stlport_t *stl_getport(int brdnr, int panelnr, int portnr)
stlpanel_t *panelp; stlpanel_t *panelp;
if ((brdnr < 0) || (brdnr >= STL_MAXBRDS)) if ((brdnr < 0) || (brdnr >= STL_MAXBRDS))
return((stlport_t *) NULL); return(NULL);
brdp = stl_brds[brdnr]; brdp = stl_brds[brdnr];
if (brdp == (stlbrd_t *) NULL) if (brdp == NULL)
return((stlport_t *) NULL); return(NULL);
if ((panelnr < 0) || (panelnr >= brdp->nrpanels)) if ((panelnr < 0) || (panelnr >= brdp->nrpanels))
return((stlport_t *) NULL); return(NULL);
panelp = brdp->panels[panelnr]; panelp = brdp->panels[panelnr];
if (panelp == (stlpanel_t *) NULL) if (panelp == NULL)
return((stlport_t *) NULL); return(NULL);
if ((portnr < 0) || (portnr >= panelp->nrports)) if ((portnr < 0) || (portnr >= panelp->nrports))
return((stlport_t *) NULL); return(NULL);
return(panelp->ports[portnr]); return(panelp->ports[portnr]);
} }
...@@ -2764,7 +2764,7 @@ static int stl_getportstats(stlport_t *portp, comstats_t __user *cp) ...@@ -2764,7 +2764,7 @@ static int stl_getportstats(stlport_t *portp, comstats_t __user *cp)
return -EFAULT; return -EFAULT;
portp = stl_getport(stl_comstats.brd, stl_comstats.panel, portp = stl_getport(stl_comstats.brd, stl_comstats.panel,
stl_comstats.port); stl_comstats.port);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return(-ENODEV); return(-ENODEV);
} }
...@@ -2780,12 +2780,12 @@ static int stl_getportstats(stlport_t *portp, comstats_t __user *cp) ...@@ -2780,12 +2780,12 @@ static int stl_getportstats(stlport_t *portp, comstats_t __user *cp)
portp->stats.rxbuffered = 0; portp->stats.rxbuffered = 0;
spin_lock_irqsave(&stallion_lock, flags); spin_lock_irqsave(&stallion_lock, flags);
if (portp->tty != (struct tty_struct *) NULL) { if (portp->tty != NULL) {
if (portp->tty->driver_data == portp) { if (portp->tty->driver_data == portp) {
portp->stats.ttystate = portp->tty->flags; portp->stats.ttystate = portp->tty->flags;
/* No longer available as a statistic */ /* No longer available as a statistic */
portp->stats.rxbuffered = 1; /*portp->tty->flip.count; */ portp->stats.rxbuffered = 1; /*portp->tty->flip.count; */
if (portp->tty->termios != (struct termios *) NULL) { if (portp->tty->termios != NULL) {
portp->stats.cflags = portp->tty->termios->c_cflag; portp->stats.cflags = portp->tty->termios->c_cflag;
portp->stats.iflags = portp->tty->termios->c_iflag; portp->stats.iflags = portp->tty->termios->c_iflag;
portp->stats.oflags = portp->tty->termios->c_oflag; portp->stats.oflags = portp->tty->termios->c_oflag;
...@@ -2819,7 +2819,7 @@ static int stl_clrportstats(stlport_t *portp, comstats_t __user *cp) ...@@ -2819,7 +2819,7 @@ static int stl_clrportstats(stlport_t *portp, comstats_t __user *cp)
return -EFAULT; return -EFAULT;
portp = stl_getport(stl_comstats.brd, stl_comstats.panel, portp = stl_getport(stl_comstats.brd, stl_comstats.panel,
stl_comstats.port); stl_comstats.port);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return(-ENODEV); return(-ENODEV);
} }
...@@ -3090,8 +3090,8 @@ static void stl_cd1400portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *po ...@@ -3090,8 +3090,8 @@ static void stl_cd1400portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *po
pr_debug("stl_cd1400portinit(brdp=%p,panelp=%p,portp=%p)\n", brdp, pr_debug("stl_cd1400portinit(brdp=%p,panelp=%p,portp=%p)\n", brdp,
panelp, portp); panelp, portp);
if ((brdp == (stlbrd_t *) NULL) || (panelp == (stlpanel_t *) NULL) || if ((brdp == NULL) || (panelp == NULL) ||
(portp == (stlport_t *) NULL)) (portp == NULL))
return; return;
spin_lock_irqsave(&brd_lock, flags); spin_lock_irqsave(&brd_lock, flags);
...@@ -3162,7 +3162,7 @@ static void stl_cd1400setport(stlport_t *portp, struct termios *tiosp) ...@@ -3162,7 +3162,7 @@ static void stl_cd1400setport(stlport_t *portp, struct termios *tiosp)
sreroff = 0; sreroff = 0;
brdp = stl_brds[portp->brdnr]; brdp = stl_brds[portp->brdnr];
if (brdp == (stlbrd_t *) NULL) if (brdp == NULL)
return; return;
/* /*
...@@ -3546,10 +3546,10 @@ static void stl_cd1400flowctrl(stlport_t *portp, int state) ...@@ -3546,10 +3546,10 @@ static void stl_cd1400flowctrl(stlport_t *portp, int state)
pr_debug("stl_cd1400flowctrl(portp=%p,state=%x)\n", portp, state); pr_debug("stl_cd1400flowctrl(portp=%p,state=%x)\n", portp, state);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
tty = portp->tty; tty = portp->tty;
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
spin_lock_irqsave(&brd_lock, flags); spin_lock_irqsave(&brd_lock, flags);
...@@ -3608,10 +3608,10 @@ static void stl_cd1400sendflow(stlport_t *portp, int state) ...@@ -3608,10 +3608,10 @@ static void stl_cd1400sendflow(stlport_t *portp, int state)
pr_debug("stl_cd1400sendflow(portp=%p,state=%x)\n", portp, state); pr_debug("stl_cd1400sendflow(portp=%p,state=%x)\n", portp, state);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
tty = portp->tty; tty = portp->tty;
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
spin_lock_irqsave(&brd_lock, flags); spin_lock_irqsave(&brd_lock, flags);
...@@ -3640,7 +3640,7 @@ static void stl_cd1400flush(stlport_t *portp) ...@@ -3640,7 +3640,7 @@ static void stl_cd1400flush(stlport_t *portp)
pr_debug("stl_cd1400flush(portp=%p)\n", portp); pr_debug("stl_cd1400flush(portp=%p)\n", portp);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
spin_lock_irqsave(&brd_lock, flags); spin_lock_irqsave(&brd_lock, flags);
...@@ -3667,7 +3667,7 @@ static int stl_cd1400datastate(stlport_t *portp) ...@@ -3667,7 +3667,7 @@ static int stl_cd1400datastate(stlport_t *portp)
{ {
pr_debug("stl_cd1400datastate(portp=%p)\n", portp); pr_debug("stl_cd1400datastate(portp=%p)\n", portp);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return 0; return 0;
return test_bit(ASYI_TXBUSY, &portp->istate) ? 1 : 0; return test_bit(ASYI_TXBUSY, &portp->istate) ? 1 : 0;
...@@ -4092,8 +4092,8 @@ static void stl_sc26198portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *p ...@@ -4092,8 +4092,8 @@ static void stl_sc26198portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *p
pr_debug("stl_sc26198portinit(brdp=%p,panelp=%p,portp=%p)\n", brdp, pr_debug("stl_sc26198portinit(brdp=%p,panelp=%p,portp=%p)\n", brdp,
panelp, portp); panelp, portp);
if ((brdp == (stlbrd_t *) NULL) || (panelp == (stlpanel_t *) NULL) || if ((brdp == NULL) || (panelp == NULL) ||
(portp == (stlport_t *) NULL)) (portp == NULL))
return; return;
portp->ioaddr = panelp->iobase + ((portp->portnr < 8) ? 0 : 4); portp->ioaddr = panelp->iobase + ((portp->portnr < 8) ? 0 : 4);
...@@ -4130,7 +4130,7 @@ static void stl_sc26198setport(stlport_t *portp, struct termios *tiosp) ...@@ -4130,7 +4130,7 @@ static void stl_sc26198setport(stlport_t *portp, struct termios *tiosp)
imroff = 0; imroff = 0;
brdp = stl_brds[portp->brdnr]; brdp = stl_brds[portp->brdnr];
if (brdp == (stlbrd_t *) NULL) if (brdp == NULL)
return; return;
/* /*
...@@ -4482,10 +4482,10 @@ static void stl_sc26198flowctrl(stlport_t *portp, int state) ...@@ -4482,10 +4482,10 @@ static void stl_sc26198flowctrl(stlport_t *portp, int state)
pr_debug("stl_sc26198flowctrl(portp=%p,state=%x)\n", portp, state); pr_debug("stl_sc26198flowctrl(portp=%p,state=%x)\n", portp, state);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
tty = portp->tty; tty = portp->tty;
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
spin_lock_irqsave(&brd_lock, flags); spin_lock_irqsave(&brd_lock, flags);
...@@ -4551,10 +4551,10 @@ static void stl_sc26198sendflow(stlport_t *portp, int state) ...@@ -4551,10 +4551,10 @@ static void stl_sc26198sendflow(stlport_t *portp, int state)
pr_debug("stl_sc26198sendflow(portp=%p,state=%x)\n", portp, state); pr_debug("stl_sc26198sendflow(portp=%p,state=%x)\n", portp, state);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
tty = portp->tty; tty = portp->tty;
if (tty == (struct tty_struct *) NULL) if (tty == NULL)
return; return;
spin_lock_irqsave(&brd_lock, flags); spin_lock_irqsave(&brd_lock, flags);
...@@ -4588,7 +4588,7 @@ static void stl_sc26198flush(stlport_t *portp) ...@@ -4588,7 +4588,7 @@ static void stl_sc26198flush(stlport_t *portp)
pr_debug("stl_sc26198flush(portp=%p)\n", portp); pr_debug("stl_sc26198flush(portp=%p)\n", portp);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
spin_lock_irqsave(&brd_lock, flags); spin_lock_irqsave(&brd_lock, flags);
...@@ -4617,7 +4617,7 @@ static int stl_sc26198datastate(stlport_t *portp) ...@@ -4617,7 +4617,7 @@ static int stl_sc26198datastate(stlport_t *portp)
pr_debug("stl_sc26198datastate(portp=%p)\n", portp); pr_debug("stl_sc26198datastate(portp=%p)\n", portp);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return 0; return 0;
if (test_bit(ASYI_TXBUSY, &portp->istate)) if (test_bit(ASYI_TXBUSY, &portp->istate))
return 1; return 1;
...@@ -4644,7 +4644,7 @@ static void stl_sc26198wait(stlport_t *portp) ...@@ -4644,7 +4644,7 @@ static void stl_sc26198wait(stlport_t *portp)
pr_debug("stl_sc26198wait(portp=%p)\n", portp); pr_debug("stl_sc26198wait(portp=%p)\n", portp);
if (portp == (stlport_t *) NULL) if (portp == NULL)
return; return;
for (i = 0; (i < 20); i++) for (i = 0; (i < 20); i++)
...@@ -4816,8 +4816,8 @@ static void stl_sc26198rxisr(stlport_t *portp, unsigned int iack) ...@@ -4816,8 +4816,8 @@ static void stl_sc26198rxisr(stlport_t *portp, unsigned int iack)
* flow control modes of the sc26198. * flow control modes of the sc26198.
*/ */
if (test_bit(ASYI_TXFLOWED, &portp->istate)) { if (test_bit(ASYI_TXFLOWED, &portp->istate)) {
if ((tty != (struct tty_struct *) NULL) && if ((tty != NULL) &&
(tty->termios != (struct termios *) NULL) && (tty->termios != NULL) &&
(tty->termios->c_iflag & IXANY)) { (tty->termios->c_iflag & IXANY)) {
stl_sc26198txunflow(portp, tty); stl_sc26198txunflow(portp, tty);
} }
...@@ -4847,7 +4847,7 @@ static inline void stl_sc26198rxbadch(stlport_t *portp, unsigned char status, ch ...@@ -4847,7 +4847,7 @@ static inline void stl_sc26198rxbadch(stlport_t *portp, unsigned char status, ch
if (status & SR_RXBREAK) if (status & SR_RXBREAK)
portp->stats.rxbreaks++; portp->stats.rxbreaks++;
if ((tty != (struct tty_struct *) NULL) && if ((tty != NULL) &&
((portp->rxignoremsk & status) == 0)) { ((portp->rxignoremsk & status) == 0)) {
if (portp->rxmarkmsk & status) { if (portp->rxmarkmsk & status) {
if (status & SR_RXBREAK) { if (status & SR_RXBREAK) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7