diff options
-rw-r--r-- | drivers/char/stallion.c | 323 |
1 files changed, 86 insertions, 237 deletions
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index 5e2de62bce70..604a2448632d 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c | |||
@@ -735,9 +735,7 @@ static void __exit stallion_module_exit(void) | |||
735 | stlport_t *portp; | 735 | stlport_t *portp; |
736 | int i, j, k; | 736 | int i, j, k; |
737 | 737 | ||
738 | #ifdef DEBUG | 738 | pr_debug("cleanup_module()\n"); |
739 | printk("cleanup_module()\n"); | ||
740 | #endif | ||
741 | 739 | ||
742 | printk(KERN_INFO "Unloading %s: version %s\n", stl_drvtitle, | 740 | printk(KERN_INFO "Unloading %s: version %s\n", stl_drvtitle, |
743 | stl_drvversion); | 741 | stl_drvversion); |
@@ -808,9 +806,7 @@ static void stl_argbrds(void) | |||
808 | stlbrd_t *brdp; | 806 | stlbrd_t *brdp; |
809 | int i; | 807 | int i; |
810 | 808 | ||
811 | #ifdef DEBUG | 809 | pr_debug("stl_argbrds()\n"); |
812 | printk("stl_argbrds()\n"); | ||
813 | #endif | ||
814 | 810 | ||
815 | for (i = stl_nrbrds; (i < stl_nargs); i++) { | 811 | for (i = stl_nrbrds; (i < stl_nargs); i++) { |
816 | memset(&conf, 0, sizeof(conf)); | 812 | memset(&conf, 0, sizeof(conf)); |
@@ -876,9 +872,7 @@ static int stl_parsebrd(stlconf_t *confp, char **argp) | |||
876 | char *sp; | 872 | char *sp; |
877 | int i; | 873 | int i; |
878 | 874 | ||
879 | #ifdef DEBUG | 875 | pr_debug("stl_parsebrd(confp=%p,argp=%p)\n", confp, argp); |
880 | printk("stl_parsebrd(confp=%x,argp=%x)\n", (int) confp, (int) argp); | ||
881 | #endif | ||
882 | 876 | ||
883 | if ((argp[0] == (char *) NULL) || (*argp[0] == 0)) | 877 | if ((argp[0] == (char *) NULL) || (*argp[0] == 0)) |
884 | return 0; | 878 | return 0; |
@@ -941,10 +935,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp) | |||
941 | unsigned int minordev; | 935 | unsigned int minordev; |
942 | int brdnr, panelnr, portnr, rc; | 936 | int brdnr, panelnr, portnr, rc; |
943 | 937 | ||
944 | #ifdef DEBUG | 938 | pr_debug("stl_open(tty=%p,filp=%p): device=%s\n", tty, filp, tty->name); |
945 | printk("stl_open(tty=%x,filp=%x): device=%s\n", (int) tty, | ||
946 | (int) filp, tty->name); | ||
947 | #endif | ||
948 | 939 | ||
949 | minordev = tty->index; | 940 | minordev = tty->index; |
950 | brdnr = MINOR2BRD(minordev); | 941 | brdnr = MINOR2BRD(minordev); |
@@ -1034,9 +1025,7 @@ static int stl_waitcarrier(stlport_t *portp, struct file *filp) | |||
1034 | unsigned long flags; | 1025 | unsigned long flags; |
1035 | int rc, doclocal; | 1026 | int rc, doclocal; |
1036 | 1027 | ||
1037 | #ifdef DEBUG | 1028 | pr_debug("stl_waitcarrier(portp=%p,filp=%p)\n", portp, filp); |
1038 | printk("stl_waitcarrier(portp=%x,filp=%x)\n", (int) portp, (int) filp); | ||
1039 | #endif | ||
1040 | 1029 | ||
1041 | rc = 0; | 1030 | rc = 0; |
1042 | doclocal = 0; | 1031 | doclocal = 0; |
@@ -1088,9 +1077,7 @@ static void stl_close(struct tty_struct *tty, struct file *filp) | |||
1088 | stlport_t *portp; | 1077 | stlport_t *portp; |
1089 | unsigned long flags; | 1078 | unsigned long flags; |
1090 | 1079 | ||
1091 | #ifdef DEBUG | 1080 | pr_debug("stl_close(tty=%p,filp=%p)\n", tty, filp); |
1092 | printk("stl_close(tty=%x,filp=%x)\n", (int) tty, (int) filp); | ||
1093 | #endif | ||
1094 | 1081 | ||
1095 | portp = tty->driver_data; | 1082 | portp = tty->driver_data; |
1096 | if (portp == (stlport_t *) NULL) | 1083 | if (portp == (stlport_t *) NULL) |
@@ -1172,10 +1159,7 @@ static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count | |||
1172 | unsigned char *chbuf; | 1159 | unsigned char *chbuf; |
1173 | char *head, *tail; | 1160 | char *head, *tail; |
1174 | 1161 | ||
1175 | #ifdef DEBUG | 1162 | pr_debug("stl_write(tty=%p,buf=%p,count=%d)\n", tty, buf, count); |
1176 | printk("stl_write(tty=%x,buf=%x,count=%d)\n", | ||
1177 | (int) tty, (int) buf, count); | ||
1178 | #endif | ||
1179 | 1163 | ||
1180 | portp = tty->driver_data; | 1164 | portp = tty->driver_data; |
1181 | if (portp == (stlport_t *) NULL) | 1165 | if (portp == (stlport_t *) NULL) |
@@ -1231,9 +1215,7 @@ static void stl_putchar(struct tty_struct *tty, unsigned char ch) | |||
1231 | unsigned int len; | 1215 | unsigned int len; |
1232 | char *head, *tail; | 1216 | char *head, *tail; |
1233 | 1217 | ||
1234 | #ifdef DEBUG | 1218 | pr_debug("stl_putchar(tty=%p,ch=%x)\n", tty, ch); |
1235 | printk("stl_putchar(tty=%x,ch=%x)\n", (int) tty, (int) ch); | ||
1236 | #endif | ||
1237 | 1219 | ||
1238 | if (tty == (struct tty_struct *) NULL) | 1220 | if (tty == (struct tty_struct *) NULL) |
1239 | return; | 1221 | return; |
@@ -1269,9 +1251,7 @@ static void stl_flushchars(struct tty_struct *tty) | |||
1269 | { | 1251 | { |
1270 | stlport_t *portp; | 1252 | stlport_t *portp; |
1271 | 1253 | ||
1272 | #ifdef DEBUG | 1254 | pr_debug("stl_flushchars(tty=%p)\n", tty); |
1273 | printk("stl_flushchars(tty=%x)\n", (int) tty); | ||
1274 | #endif | ||
1275 | 1255 | ||
1276 | if (tty == (struct tty_struct *) NULL) | 1256 | if (tty == (struct tty_struct *) NULL) |
1277 | return; | 1257 | return; |
@@ -1291,9 +1271,7 @@ static int stl_writeroom(struct tty_struct *tty) | |||
1291 | stlport_t *portp; | 1271 | stlport_t *portp; |
1292 | char *head, *tail; | 1272 | char *head, *tail; |
1293 | 1273 | ||
1294 | #ifdef DEBUG | 1274 | pr_debug("stl_writeroom(tty=%p)\n", tty); |
1295 | printk("stl_writeroom(tty=%x)\n", (int) tty); | ||
1296 | #endif | ||
1297 | 1275 | ||
1298 | if (tty == (struct tty_struct *) NULL) | 1276 | if (tty == (struct tty_struct *) NULL) |
1299 | return 0; | 1277 | return 0; |
@@ -1325,9 +1303,7 @@ static int stl_charsinbuffer(struct tty_struct *tty) | |||
1325 | unsigned int size; | 1303 | unsigned int size; |
1326 | char *head, *tail; | 1304 | char *head, *tail; |
1327 | 1305 | ||
1328 | #ifdef DEBUG | 1306 | pr_debug("stl_charsinbuffer(tty=%p)\n", tty); |
1329 | printk("stl_charsinbuffer(tty=%x)\n", (int) tty); | ||
1330 | #endif | ||
1331 | 1307 | ||
1332 | if (tty == (struct tty_struct *) NULL) | 1308 | if (tty == (struct tty_struct *) NULL) |
1333 | return 0; | 1309 | return 0; |
@@ -1356,9 +1332,7 @@ static int stl_getserial(stlport_t *portp, struct serial_struct __user *sp) | |||
1356 | struct serial_struct sio; | 1332 | struct serial_struct sio; |
1357 | stlbrd_t *brdp; | 1333 | stlbrd_t *brdp; |
1358 | 1334 | ||
1359 | #ifdef DEBUG | 1335 | pr_debug("stl_getserial(portp=%p,sp=%p)\n", portp, sp); |
1360 | printk("stl_getserial(portp=%x,sp=%x)\n", (int) portp, (int) sp); | ||
1361 | #endif | ||
1362 | 1336 | ||
1363 | memset(&sio, 0, sizeof(struct serial_struct)); | 1337 | memset(&sio, 0, sizeof(struct serial_struct)); |
1364 | sio.line = portp->portnr; | 1338 | sio.line = portp->portnr; |
@@ -1396,9 +1370,7 @@ static int stl_setserial(stlport_t *portp, struct serial_struct __user *sp) | |||
1396 | { | 1370 | { |
1397 | struct serial_struct sio; | 1371 | struct serial_struct sio; |
1398 | 1372 | ||
1399 | #ifdef DEBUG | 1373 | pr_debug("stl_setserial(portp=%p,sp=%p)\n", portp, sp); |
1400 | printk("stl_setserial(portp=%x,sp=%x)\n", (int) portp, (int) sp); | ||
1401 | #endif | ||
1402 | 1374 | ||
1403 | if (copy_from_user(&sio, sp, sizeof(struct serial_struct))) | 1375 | if (copy_from_user(&sio, sp, sizeof(struct serial_struct))) |
1404 | return -EFAULT; | 1376 | return -EFAULT; |
@@ -1471,10 +1443,8 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd | |||
1471 | int rc; | 1443 | int rc; |
1472 | void __user *argp = (void __user *)arg; | 1444 | void __user *argp = (void __user *)arg; |
1473 | 1445 | ||
1474 | #ifdef DEBUG | 1446 | pr_debug("stl_ioctl(tty=%p,file=%p,cmd=%x,arg=%lx)\n", tty, file, cmd, |
1475 | printk("stl_ioctl(tty=%x,file=%x,cmd=%x,arg=%x)\n", | 1447 | arg); |
1476 | (int) tty, (int) file, cmd, (int) arg); | ||
1477 | #endif | ||
1478 | 1448 | ||
1479 | if (tty == (struct tty_struct *) NULL) | 1449 | if (tty == (struct tty_struct *) NULL) |
1480 | return -ENODEV; | 1450 | return -ENODEV; |
@@ -1536,9 +1506,7 @@ static void stl_settermios(struct tty_struct *tty, struct termios *old) | |||
1536 | stlport_t *portp; | 1506 | stlport_t *portp; |
1537 | struct termios *tiosp; | 1507 | struct termios *tiosp; |
1538 | 1508 | ||
1539 | #ifdef DEBUG | 1509 | pr_debug("stl_settermios(tty=%p,old=%p)\n", tty, old); |
1540 | printk("stl_settermios(tty=%x,old=%x)\n", (int) tty, (int) old); | ||
1541 | #endif | ||
1542 | 1510 | ||
1543 | if (tty == (struct tty_struct *) NULL) | 1511 | if (tty == (struct tty_struct *) NULL) |
1544 | return; | 1512 | return; |
@@ -1573,9 +1541,7 @@ static void stl_throttle(struct tty_struct *tty) | |||
1573 | { | 1541 | { |
1574 | stlport_t *portp; | 1542 | stlport_t *portp; |
1575 | 1543 | ||
1576 | #ifdef DEBUG | 1544 | pr_debug("stl_throttle(tty=%p)\n", tty); |
1577 | printk("stl_throttle(tty=%x)\n", (int) tty); | ||
1578 | #endif | ||
1579 | 1545 | ||
1580 | if (tty == (struct tty_struct *) NULL) | 1546 | if (tty == (struct tty_struct *) NULL) |
1581 | return; | 1547 | return; |
@@ -1595,9 +1561,7 @@ static void stl_unthrottle(struct tty_struct *tty) | |||
1595 | { | 1561 | { |
1596 | stlport_t *portp; | 1562 | stlport_t *portp; |
1597 | 1563 | ||
1598 | #ifdef DEBUG | 1564 | pr_debug("stl_unthrottle(tty=%p)\n", tty); |
1599 | printk("stl_unthrottle(tty=%x)\n", (int) tty); | ||
1600 | #endif | ||
1601 | 1565 | ||
1602 | if (tty == (struct tty_struct *) NULL) | 1566 | if (tty == (struct tty_struct *) NULL) |
1603 | return; | 1567 | return; |
@@ -1618,9 +1582,7 @@ static void stl_stop(struct tty_struct *tty) | |||
1618 | { | 1582 | { |
1619 | stlport_t *portp; | 1583 | stlport_t *portp; |
1620 | 1584 | ||
1621 | #ifdef DEBUG | 1585 | pr_debug("stl_stop(tty=%p)\n", tty); |
1622 | printk("stl_stop(tty=%x)\n", (int) tty); | ||
1623 | #endif | ||
1624 | 1586 | ||
1625 | if (tty == (struct tty_struct *) NULL) | 1587 | if (tty == (struct tty_struct *) NULL) |
1626 | return; | 1588 | return; |
@@ -1640,9 +1602,7 @@ static void stl_start(struct tty_struct *tty) | |||
1640 | { | 1602 | { |
1641 | stlport_t *portp; | 1603 | stlport_t *portp; |
1642 | 1604 | ||
1643 | #ifdef DEBUG | 1605 | pr_debug("stl_start(tty=%p)\n", tty); |
1644 | printk("stl_start(tty=%x)\n", (int) tty); | ||
1645 | #endif | ||
1646 | 1606 | ||
1647 | if (tty == (struct tty_struct *) NULL) | 1607 | if (tty == (struct tty_struct *) NULL) |
1648 | return; | 1608 | return; |
@@ -1664,9 +1624,7 @@ static void stl_hangup(struct tty_struct *tty) | |||
1664 | { | 1624 | { |
1665 | stlport_t *portp; | 1625 | stlport_t *portp; |
1666 | 1626 | ||
1667 | #ifdef DEBUG | 1627 | pr_debug("stl_hangup(tty=%p)\n", tty); |
1668 | printk("stl_hangup(tty=%x)\n", (int) tty); | ||
1669 | #endif | ||
1670 | 1628 | ||
1671 | if (tty == (struct tty_struct *) NULL) | 1629 | if (tty == (struct tty_struct *) NULL) |
1672 | return; | 1630 | return; |
@@ -1700,9 +1658,7 @@ static void stl_flushbuffer(struct tty_struct *tty) | |||
1700 | { | 1658 | { |
1701 | stlport_t *portp; | 1659 | stlport_t *portp; |
1702 | 1660 | ||
1703 | #ifdef DEBUG | 1661 | pr_debug("stl_flushbuffer(tty=%p)\n", tty); |
1704 | printk("stl_flushbuffer(tty=%x)\n", (int) tty); | ||
1705 | #endif | ||
1706 | 1662 | ||
1707 | if (tty == (struct tty_struct *) NULL) | 1663 | if (tty == (struct tty_struct *) NULL) |
1708 | return; | 1664 | return; |
@@ -1720,9 +1676,7 @@ static void stl_breakctl(struct tty_struct *tty, int state) | |||
1720 | { | 1676 | { |
1721 | stlport_t *portp; | 1677 | stlport_t *portp; |
1722 | 1678 | ||
1723 | #ifdef DEBUG | 1679 | pr_debug("stl_breakctl(tty=%p,state=%d)\n", tty, state); |
1724 | printk("stl_breakctl(tty=%x,state=%d)\n", (int) tty, state); | ||
1725 | #endif | ||
1726 | 1680 | ||
1727 | if (tty == (struct tty_struct *) NULL) | 1681 | if (tty == (struct tty_struct *) NULL) |
1728 | return; | 1682 | return; |
@@ -1740,9 +1694,7 @@ static void stl_waituntilsent(struct tty_struct *tty, int timeout) | |||
1740 | stlport_t *portp; | 1694 | stlport_t *portp; |
1741 | unsigned long tend; | 1695 | unsigned long tend; |
1742 | 1696 | ||
1743 | #ifdef DEBUG | 1697 | pr_debug("stl_waituntilsent(tty=%p,timeout=%d)\n", tty, timeout); |
1744 | printk("stl_waituntilsent(tty=%x,timeout=%d)\n", (int) tty, timeout); | ||
1745 | #endif | ||
1746 | 1698 | ||
1747 | if (tty == (struct tty_struct *) NULL) | 1699 | if (tty == (struct tty_struct *) NULL) |
1748 | return; | 1700 | return; |
@@ -1769,9 +1721,7 @@ static void stl_sendxchar(struct tty_struct *tty, char ch) | |||
1769 | { | 1721 | { |
1770 | stlport_t *portp; | 1722 | stlport_t *portp; |
1771 | 1723 | ||
1772 | #ifdef DEBUG | 1724 | pr_debug("stl_sendxchar(tty=%p,ch=%x)\n", tty, ch); |
1773 | printk("stl_sendxchar(tty=%x,ch=%x)\n", (int) tty, ch); | ||
1774 | #endif | ||
1775 | 1725 | ||
1776 | if (tty == (struct tty_struct *) NULL) | 1726 | if (tty == (struct tty_struct *) NULL) |
1777 | return; | 1727 | return; |
@@ -1850,11 +1800,8 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof | |||
1850 | int curoff, maxoff; | 1800 | int curoff, maxoff; |
1851 | char *pos; | 1801 | char *pos; |
1852 | 1802 | ||
1853 | #ifdef DEBUG | 1803 | pr_debug("stl_readproc(page=%p,start=%p,off=%lx,count=%d,eof=%p," |
1854 | printk("stl_readproc(page=%x,start=%x,off=%x,count=%d,eof=%x," | 1804 | "data=%p\n", page, start, off, count, eof, data); |
1855 | "data=%x\n", (int) page, (int) start, (int) off, count, | ||
1856 | (int) eof, (int) data); | ||
1857 | #endif | ||
1858 | 1805 | ||
1859 | pos = page; | 1806 | pos = page; |
1860 | totalport = 0; | 1807 | totalport = 0; |
@@ -1931,9 +1878,7 @@ static irqreturn_t stl_intr(int irq, void *dev_id) | |||
1931 | { | 1878 | { |
1932 | stlbrd_t *brdp = (stlbrd_t *) dev_id; | 1879 | stlbrd_t *brdp = (stlbrd_t *) dev_id; |
1933 | 1880 | ||
1934 | #ifdef DEBUG | 1881 | pr_debug("stl_intr(brdp=%p,irq=%d)\n", brdp, irq); |
1935 | printk("stl_intr(brdp=%x,irq=%d)\n", (int) brdp, irq); | ||
1936 | #endif | ||
1937 | 1882 | ||
1938 | return IRQ_RETVAL((* brdp->isr)(brdp)); | 1883 | return IRQ_RETVAL((* brdp->isr)(brdp)); |
1939 | } | 1884 | } |
@@ -2087,9 +2032,7 @@ static void stl_offintr(struct work_struct *work) | |||
2087 | struct tty_struct *tty; | 2032 | struct tty_struct *tty; |
2088 | unsigned int oldsigs; | 2033 | unsigned int oldsigs; |
2089 | 2034 | ||
2090 | #ifdef DEBUG | 2035 | pr_debug("stl_offintr(portp=%p)\n", portp); |
2091 | printk("stl_offintr(portp=%x)\n", (int) portp); | ||
2092 | #endif | ||
2093 | 2036 | ||
2094 | if (portp == (stlport_t *) NULL) | 2037 | if (portp == (stlport_t *) NULL) |
2095 | return; | 2038 | return; |
@@ -2127,9 +2070,7 @@ static int __init stl_initports(stlbrd_t *brdp, stlpanel_t *panelp) | |||
2127 | stlport_t *portp; | 2070 | stlport_t *portp; |
2128 | int chipmask, i; | 2071 | int chipmask, i; |
2129 | 2072 | ||
2130 | #ifdef DEBUG | 2073 | pr_debug("stl_initports(brdp=%p,panelp=%p)\n", brdp, panelp); |
2131 | printk("stl_initports(brdp=%x,panelp=%x)\n", (int) brdp, (int) panelp); | ||
2132 | #endif | ||
2133 | 2074 | ||
2134 | chipmask = stl_panelinit(brdp, panelp); | 2075 | chipmask = stl_panelinit(brdp, panelp); |
2135 | 2076 | ||
@@ -2180,9 +2121,7 @@ static inline int stl_initeio(stlbrd_t *brdp) | |||
2180 | char *name; | 2121 | char *name; |
2181 | int rc; | 2122 | int rc; |
2182 | 2123 | ||
2183 | #ifdef DEBUG | 2124 | pr_debug("stl_initeio(brdp=%p)\n", brdp); |
2184 | printk("stl_initeio(brdp=%x)\n", (int) brdp); | ||
2185 | #endif | ||
2186 | 2125 | ||
2187 | brdp->ioctrl = brdp->ioaddr1 + 1; | 2126 | brdp->ioctrl = brdp->ioaddr1 + 1; |
2188 | brdp->iostatus = brdp->ioaddr1 + 2; | 2127 | brdp->iostatus = brdp->ioaddr1 + 2; |
@@ -2323,9 +2262,7 @@ static inline int stl_initech(stlbrd_t *brdp) | |||
2323 | int panelnr, banknr, i; | 2262 | int panelnr, banknr, i; |
2324 | char *name; | 2263 | char *name; |
2325 | 2264 | ||
2326 | #ifdef DEBUG | 2265 | pr_debug("stl_initech(brdp=%p)\n", brdp); |
2327 | printk("stl_initech(brdp=%x)\n", (int) brdp); | ||
2328 | #endif | ||
2329 | 2266 | ||
2330 | status = 0; | 2267 | status = 0; |
2331 | conflict = 0; | 2268 | conflict = 0; |
@@ -2533,9 +2470,7 @@ static int __init stl_brdinit(stlbrd_t *brdp) | |||
2533 | { | 2470 | { |
2534 | int i; | 2471 | int i; |
2535 | 2472 | ||
2536 | #ifdef DEBUG | 2473 | pr_debug("stl_brdinit(brdp=%p)\n", brdp); |
2537 | printk("stl_brdinit(brdp=%x)\n", (int) brdp); | ||
2538 | #endif | ||
2539 | 2474 | ||
2540 | switch (brdp->brdtype) { | 2475 | switch (brdp->brdtype) { |
2541 | case BRD_EASYIO: | 2476 | case BRD_EASYIO: |
@@ -2607,10 +2542,8 @@ static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp) | |||
2607 | { | 2542 | { |
2608 | stlbrd_t *brdp; | 2543 | stlbrd_t *brdp; |
2609 | 2544 | ||
2610 | #ifdef DEBUG | 2545 | pr_debug("stl_initpcibrd(brdtype=%d,busnr=%x,devnr=%x)\n", brdtype, |
2611 | printk("stl_initpcibrd(brdtype=%d,busnr=%x,devnr=%x)\n", brdtype, | ||
2612 | devp->bus->number, devp->devfn); | 2546 | devp->bus->number, devp->devfn); |
2613 | #endif | ||
2614 | 2547 | ||
2615 | if (pci_enable_device(devp)) | 2548 | if (pci_enable_device(devp)) |
2616 | return(-EIO); | 2549 | return(-EIO); |
@@ -2627,11 +2560,9 @@ static inline int stl_initpcibrd(int brdtype, struct pci_dev *devp) | |||
2627 | * Different Stallion boards use the BAR registers in different ways, | 2560 | * Different Stallion boards use the BAR registers in different ways, |
2628 | * so set up io addresses based on board type. | 2561 | * so set up io addresses based on board type. |
2629 | */ | 2562 | */ |
2630 | #ifdef DEBUG | 2563 | pr_debug("%s(%d): BAR[]=%Lx,%Lx,%Lx,%Lx IRQ=%x\n", __FILE__, __LINE__, |
2631 | printk("%s(%d): BAR[]=%x,%x,%x,%x IRQ=%x\n", __FILE__, __LINE__, | ||
2632 | pci_resource_start(devp, 0), pci_resource_start(devp, 1), | 2564 | pci_resource_start(devp, 0), pci_resource_start(devp, 1), |
2633 | pci_resource_start(devp, 2), pci_resource_start(devp, 3), devp->irq); | 2565 | pci_resource_start(devp, 2), pci_resource_start(devp, 3), devp->irq); |
2634 | #endif | ||
2635 | 2566 | ||
2636 | /* | 2567 | /* |
2637 | * We have all resources from the board, so let's setup the actual | 2568 | * We have all resources from the board, so let's setup the actual |
@@ -2674,9 +2605,7 @@ static inline int stl_findpcibrds(void) | |||
2674 | struct pci_dev *dev = NULL; | 2605 | struct pci_dev *dev = NULL; |
2675 | int i, rc; | 2606 | int i, rc; |
2676 | 2607 | ||
2677 | #ifdef DEBUG | 2608 | pr_debug("stl_findpcibrds()\n"); |
2678 | printk("stl_findpcibrds()\n"); | ||
2679 | #endif | ||
2680 | 2609 | ||
2681 | for (i = 0; (i < stl_nrpcibrds); i++) | 2610 | for (i = 0; (i < stl_nrpcibrds); i++) |
2682 | while ((dev = pci_find_device(stl_pcibrds[i].vendid, | 2611 | while ((dev = pci_find_device(stl_pcibrds[i].vendid, |
@@ -2713,9 +2642,7 @@ static inline int stl_initbrds(void) | |||
2713 | stlconf_t *confp; | 2642 | stlconf_t *confp; |
2714 | int i; | 2643 | int i; |
2715 | 2644 | ||
2716 | #ifdef DEBUG | 2645 | pr_debug("stl_initbrds()\n"); |
2717 | printk("stl_initbrds()\n"); | ||
2718 | #endif | ||
2719 | 2646 | ||
2720 | if (stl_nrbrds > STL_MAXBRDS) { | 2647 | if (stl_nrbrds > STL_MAXBRDS) { |
2721 | printk("STALLION: too many boards in configuration table, " | 2648 | printk("STALLION: too many boards in configuration table, " |
@@ -2956,10 +2883,7 @@ static int stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, uns | |||
2956 | int brdnr, rc; | 2883 | int brdnr, rc; |
2957 | void __user *argp = (void __user *)arg; | 2884 | void __user *argp = (void __user *)arg; |
2958 | 2885 | ||
2959 | #ifdef DEBUG | 2886 | pr_debug("stl_memioctl(ip=%p,fp=%p,cmd=%x,arg=%lx)\n", ip, fp, cmd,arg); |
2960 | printk("stl_memioctl(ip=%x,fp=%x,cmd=%x,arg=%x)\n", (int) ip, | ||
2961 | (int) fp, cmd, (int) arg); | ||
2962 | #endif | ||
2963 | 2887 | ||
2964 | brdnr = iminor(ip); | 2888 | brdnr = iminor(ip); |
2965 | if (brdnr >= STL_MAXBRDS) | 2889 | if (brdnr >= STL_MAXBRDS) |
@@ -3110,9 +3034,7 @@ static int stl_cd1400panelinit(stlbrd_t *brdp, stlpanel_t *panelp) | |||
3110 | int nrchips, uartaddr, ioaddr; | 3034 | int nrchips, uartaddr, ioaddr; |
3111 | unsigned long flags; | 3035 | unsigned long flags; |
3112 | 3036 | ||
3113 | #ifdef DEBUG | 3037 | pr_debug("stl_panelinit(brdp=%p,panelp=%p)\n", brdp, panelp); |
3114 | printk("stl_panelinit(brdp=%x,panelp=%x)\n", (int) brdp, (int) panelp); | ||
3115 | #endif | ||
3116 | 3038 | ||
3117 | spin_lock_irqsave(&brd_lock, flags); | 3039 | spin_lock_irqsave(&brd_lock, flags); |
3118 | BRDENABLE(panelp->brdnr, panelp->pagenr); | 3040 | BRDENABLE(panelp->brdnr, panelp->pagenr); |
@@ -3165,10 +3087,8 @@ static int stl_cd1400panelinit(stlbrd_t *brdp, stlpanel_t *panelp) | |||
3165 | static void stl_cd1400portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *portp) | 3087 | static void stl_cd1400portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *portp) |
3166 | { | 3088 | { |
3167 | unsigned long flags; | 3089 | unsigned long flags; |
3168 | #ifdef DEBUG | 3090 | pr_debug("stl_cd1400portinit(brdp=%p,panelp=%p,portp=%p)\n", brdp, |
3169 | printk("stl_cd1400portinit(brdp=%x,panelp=%x,portp=%x)\n", | 3091 | panelp, portp); |
3170 | (int) brdp, (int) panelp, (int) portp); | ||
3171 | #endif | ||
3172 | 3092 | ||
3173 | if ((brdp == (stlbrd_t *) NULL) || (panelp == (stlpanel_t *) NULL) || | 3093 | if ((brdp == (stlbrd_t *) NULL) || (panelp == (stlpanel_t *) NULL) || |
3174 | (portp == (stlport_t *) NULL)) | 3094 | (portp == (stlport_t *) NULL)) |
@@ -3382,18 +3302,16 @@ static void stl_cd1400setport(stlport_t *portp, struct termios *tiosp) | |||
3382 | * them all up. | 3302 | * them all up. |
3383 | */ | 3303 | */ |
3384 | 3304 | ||
3385 | #ifdef DEBUG | 3305 | pr_debug("SETPORT: portnr=%d panelnr=%d brdnr=%d\n", |
3386 | printk("SETPORT: portnr=%d panelnr=%d brdnr=%d\n", | ||
3387 | portp->portnr, portp->panelnr, portp->brdnr); | 3306 | portp->portnr, portp->panelnr, portp->brdnr); |
3388 | printk(" cor1=%x cor2=%x cor3=%x cor4=%x cor5=%x\n", | 3307 | pr_debug(" cor1=%x cor2=%x cor3=%x cor4=%x cor5=%x\n", |
3389 | cor1, cor2, cor3, cor4, cor5); | 3308 | cor1, cor2, cor3, cor4, cor5); |
3390 | printk(" mcor1=%x mcor2=%x rtpr=%x sreron=%x sreroff=%x\n", | 3309 | pr_debug(" mcor1=%x mcor2=%x rtpr=%x sreron=%x sreroff=%x\n", |
3391 | mcor1, mcor2, rtpr, sreron, sreroff); | 3310 | mcor1, mcor2, rtpr, sreron, sreroff); |
3392 | printk(" tcor=%x tbpr=%x rcor=%x rbpr=%x\n", clk, div, clk, div); | 3311 | pr_debug(" tcor=%x tbpr=%x rcor=%x rbpr=%x\n", clk, div, clk, div); |
3393 | printk(" schr1=%x schr2=%x schr3=%x schr4=%x\n", | 3312 | pr_debug(" schr1=%x schr2=%x schr3=%x schr4=%x\n", |
3394 | tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP], | 3313 | tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP], |
3395 | tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP]); | 3314 | tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP]); |
3396 | #endif | ||
3397 | 3315 | ||
3398 | spin_lock_irqsave(&brd_lock, flags); | 3316 | spin_lock_irqsave(&brd_lock, flags); |
3399 | BRDENABLE(portp->brdnr, portp->pagenr); | 3317 | BRDENABLE(portp->brdnr, portp->pagenr); |
@@ -3446,10 +3364,8 @@ static void stl_cd1400setsignals(stlport_t *portp, int dtr, int rts) | |||
3446 | unsigned char msvr1, msvr2; | 3364 | unsigned char msvr1, msvr2; |
3447 | unsigned long flags; | 3365 | unsigned long flags; |
3448 | 3366 | ||
3449 | #ifdef DEBUG | 3367 | pr_debug("stl_cd1400setsignals(portp=%p,dtr=%d,rts=%d)\n", |
3450 | printk("stl_cd1400setsignals(portp=%x,dtr=%d,rts=%d)\n", | 3368 | portp, dtr, rts); |
3451 | (int) portp, dtr, rts); | ||
3452 | #endif | ||
3453 | 3369 | ||
3454 | msvr1 = 0; | 3370 | msvr1 = 0; |
3455 | msvr2 = 0; | 3371 | msvr2 = 0; |
@@ -3481,9 +3397,7 @@ static int stl_cd1400getsignals(stlport_t *portp) | |||
3481 | unsigned long flags; | 3397 | unsigned long flags; |
3482 | int sigs; | 3398 | int sigs; |
3483 | 3399 | ||
3484 | #ifdef DEBUG | 3400 | pr_debug("stl_cd1400getsignals(portp=%p)\n", portp); |
3485 | printk("stl_cd1400getsignals(portp=%x)\n", (int) portp); | ||
3486 | #endif | ||
3487 | 3401 | ||
3488 | spin_lock_irqsave(&brd_lock, flags); | 3402 | spin_lock_irqsave(&brd_lock, flags); |
3489 | BRDENABLE(portp->brdnr, portp->pagenr); | 3403 | BRDENABLE(portp->brdnr, portp->pagenr); |
@@ -3518,10 +3432,8 @@ static void stl_cd1400enablerxtx(stlport_t *portp, int rx, int tx) | |||
3518 | unsigned char ccr; | 3432 | unsigned char ccr; |
3519 | unsigned long flags; | 3433 | unsigned long flags; |
3520 | 3434 | ||
3521 | #ifdef DEBUG | 3435 | pr_debug("stl_cd1400enablerxtx(portp=%p,rx=%d,tx=%d)\n", portp, rx, tx); |
3522 | printk("stl_cd1400enablerxtx(portp=%x,rx=%d,tx=%d)\n", | 3436 | |
3523 | (int) portp, rx, tx); | ||
3524 | #endif | ||
3525 | ccr = 0; | 3437 | ccr = 0; |
3526 | 3438 | ||
3527 | if (tx == 0) | 3439 | if (tx == 0) |
@@ -3554,10 +3466,7 @@ static void stl_cd1400startrxtx(stlport_t *portp, int rx, int tx) | |||
3554 | unsigned char sreron, sreroff; | 3466 | unsigned char sreron, sreroff; |
3555 | unsigned long flags; | 3467 | unsigned long flags; |
3556 | 3468 | ||
3557 | #ifdef DEBUG | 3469 | pr_debug("stl_cd1400startrxtx(portp=%p,rx=%d,tx=%d)\n", portp, rx, tx); |
3558 | printk("stl_cd1400startrxtx(portp=%x,rx=%d,tx=%d)\n", | ||
3559 | (int) portp, rx, tx); | ||
3560 | #endif | ||
3561 | 3470 | ||
3562 | sreron = 0; | 3471 | sreron = 0; |
3563 | sreroff = 0; | 3472 | sreroff = 0; |
@@ -3593,9 +3502,8 @@ static void stl_cd1400disableintrs(stlport_t *portp) | |||
3593 | { | 3502 | { |
3594 | unsigned long flags; | 3503 | unsigned long flags; |
3595 | 3504 | ||
3596 | #ifdef DEBUG | 3505 | pr_debug("stl_cd1400disableintrs(portp=%p)\n", portp); |
3597 | printk("stl_cd1400disableintrs(portp=%x)\n", (int) portp); | 3506 | |
3598 | #endif | ||
3599 | spin_lock_irqsave(&brd_lock, flags); | 3507 | spin_lock_irqsave(&brd_lock, flags); |
3600 | BRDENABLE(portp->brdnr, portp->pagenr); | 3508 | BRDENABLE(portp->brdnr, portp->pagenr); |
3601 | stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03)); | 3509 | stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03)); |
@@ -3610,9 +3518,7 @@ static void stl_cd1400sendbreak(stlport_t *portp, int len) | |||
3610 | { | 3518 | { |
3611 | unsigned long flags; | 3519 | unsigned long flags; |
3612 | 3520 | ||
3613 | #ifdef DEBUG | 3521 | pr_debug("stl_cd1400sendbreak(portp=%p,len=%d)\n", portp, len); |
3614 | printk("stl_cd1400sendbreak(portp=%x,len=%d)\n", (int) portp, len); | ||
3615 | #endif | ||
3616 | 3522 | ||
3617 | spin_lock_irqsave(&brd_lock, flags); | 3523 | spin_lock_irqsave(&brd_lock, flags); |
3618 | BRDENABLE(portp->brdnr, portp->pagenr); | 3524 | BRDENABLE(portp->brdnr, portp->pagenr); |
@@ -3638,9 +3544,7 @@ static void stl_cd1400flowctrl(stlport_t *portp, int state) | |||
3638 | struct tty_struct *tty; | 3544 | struct tty_struct *tty; |
3639 | unsigned long flags; | 3545 | unsigned long flags; |
3640 | 3546 | ||
3641 | #ifdef DEBUG | 3547 | pr_debug("stl_cd1400flowctrl(portp=%p,state=%x)\n", portp, state); |
3642 | printk("stl_cd1400flowctrl(portp=%x,state=%x)\n", (int) portp, state); | ||
3643 | #endif | ||
3644 | 3548 | ||
3645 | if (portp == (stlport_t *) NULL) | 3549 | if (portp == (stlport_t *) NULL) |
3646 | return; | 3550 | return; |
@@ -3702,9 +3606,7 @@ static void stl_cd1400sendflow(stlport_t *portp, int state) | |||
3702 | struct tty_struct *tty; | 3606 | struct tty_struct *tty; |
3703 | unsigned long flags; | 3607 | unsigned long flags; |
3704 | 3608 | ||
3705 | #ifdef DEBUG | 3609 | pr_debug("stl_cd1400sendflow(portp=%p,state=%x)\n", portp, state); |
3706 | printk("stl_cd1400sendflow(portp=%x,state=%x)\n", (int) portp, state); | ||
3707 | #endif | ||
3708 | 3610 | ||
3709 | if (portp == (stlport_t *) NULL) | 3611 | if (portp == (stlport_t *) NULL) |
3710 | return; | 3612 | return; |
@@ -3736,9 +3638,7 @@ static void stl_cd1400flush(stlport_t *portp) | |||
3736 | { | 3638 | { |
3737 | unsigned long flags; | 3639 | unsigned long flags; |
3738 | 3640 | ||
3739 | #ifdef DEBUG | 3641 | pr_debug("stl_cd1400flush(portp=%p)\n", portp); |
3740 | printk("stl_cd1400flush(portp=%x)\n", (int) portp); | ||
3741 | #endif | ||
3742 | 3642 | ||
3743 | if (portp == (stlport_t *) NULL) | 3643 | if (portp == (stlport_t *) NULL) |
3744 | return; | 3644 | return; |
@@ -3765,9 +3665,7 @@ static void stl_cd1400flush(stlport_t *portp) | |||
3765 | 3665 | ||
3766 | static int stl_cd1400datastate(stlport_t *portp) | 3666 | static int stl_cd1400datastate(stlport_t *portp) |
3767 | { | 3667 | { |
3768 | #ifdef DEBUG | 3668 | pr_debug("stl_cd1400datastate(portp=%p)\n", portp); |
3769 | printk("stl_cd1400datastate(portp=%x)\n", (int) portp); | ||
3770 | #endif | ||
3771 | 3669 | ||
3772 | if (portp == (stlport_t *) NULL) | 3670 | if (portp == (stlport_t *) NULL) |
3773 | return 0; | 3671 | return 0; |
@@ -3785,10 +3683,7 @@ static void stl_cd1400eiointr(stlpanel_t *panelp, unsigned int iobase) | |||
3785 | { | 3683 | { |
3786 | unsigned char svrtype; | 3684 | unsigned char svrtype; |
3787 | 3685 | ||
3788 | #ifdef DEBUG | 3686 | pr_debug("stl_cd1400eiointr(panelp=%p,iobase=%x)\n", panelp, iobase); |
3789 | printk("stl_cd1400eiointr(panelp=%x,iobase=%x)\n", | ||
3790 | (int) panelp, iobase); | ||
3791 | #endif | ||
3792 | 3687 | ||
3793 | spin_lock(&brd_lock); | 3688 | spin_lock(&brd_lock); |
3794 | outb(SVRR, iobase); | 3689 | outb(SVRR, iobase); |
@@ -3818,10 +3713,7 @@ static void stl_cd1400echintr(stlpanel_t *panelp, unsigned int iobase) | |||
3818 | { | 3713 | { |
3819 | unsigned char svrtype; | 3714 | unsigned char svrtype; |
3820 | 3715 | ||
3821 | #ifdef DEBUG | 3716 | pr_debug("stl_cd1400echintr(panelp=%p,iobase=%x)\n", panelp, iobase); |
3822 | printk("stl_cd1400echintr(panelp=%x,iobase=%x)\n", (int) panelp, | ||
3823 | iobase); | ||
3824 | #endif | ||
3825 | 3717 | ||
3826 | outb(SVRR, iobase); | 3718 | outb(SVRR, iobase); |
3827 | svrtype = inb(iobase + EREG_DATA); | 3719 | svrtype = inb(iobase + EREG_DATA); |
@@ -3892,9 +3784,7 @@ static void stl_cd1400txisr(stlpanel_t *panelp, int ioaddr) | |||
3892 | char *head, *tail; | 3784 | char *head, *tail; |
3893 | unsigned char ioack, srer; | 3785 | unsigned char ioack, srer; |
3894 | 3786 | ||
3895 | #ifdef DEBUG | 3787 | pr_debug("stl_cd1400txisr(panelp=%p,ioaddr=%x)\n", panelp, ioaddr); |
3896 | printk("stl_cd1400txisr(panelp=%x,ioaddr=%x)\n", (int) panelp, ioaddr); | ||
3897 | #endif | ||
3898 | 3788 | ||
3899 | ioack = inb(ioaddr + EREG_TXACK); | 3789 | ioack = inb(ioaddr + EREG_TXACK); |
3900 | if (((ioack & panelp->ackmask) != 0) || | 3790 | if (((ioack & panelp->ackmask) != 0) || |
@@ -3974,9 +3864,7 @@ static void stl_cd1400rxisr(stlpanel_t *panelp, int ioaddr) | |||
3974 | unsigned char status; | 3864 | unsigned char status; |
3975 | char ch; | 3865 | char ch; |
3976 | 3866 | ||
3977 | #ifdef DEBUG | 3867 | pr_debug("stl_cd1400rxisr(panelp=%p,ioaddr=%x)\n", panelp, ioaddr); |
3978 | printk("stl_cd1400rxisr(panelp=%x,ioaddr=%x)\n", (int) panelp, ioaddr); | ||
3979 | #endif | ||
3980 | 3868 | ||
3981 | ioack = inb(ioaddr + EREG_RXACK); | 3869 | ioack = inb(ioaddr + EREG_RXACK); |
3982 | if ((ioack & panelp->ackmask) != 0) { | 3870 | if ((ioack & panelp->ackmask) != 0) { |
@@ -4072,9 +3960,7 @@ static void stl_cd1400mdmisr(stlpanel_t *panelp, int ioaddr) | |||
4072 | unsigned int ioack; | 3960 | unsigned int ioack; |
4073 | unsigned char misr; | 3961 | unsigned char misr; |
4074 | 3962 | ||
4075 | #ifdef DEBUG | 3963 | pr_debug("stl_cd1400mdmisr(panelp=%p)\n", panelp); |
4076 | printk("stl_cd1400mdmisr(panelp=%x)\n", (int) panelp); | ||
4077 | #endif | ||
4078 | 3964 | ||
4079 | ioack = inb(ioaddr + EREG_MDACK); | 3965 | ioack = inb(ioaddr + EREG_MDACK); |
4080 | if (((ioack & panelp->ackmask) != 0) || | 3966 | if (((ioack & panelp->ackmask) != 0) || |
@@ -4161,10 +4047,7 @@ static int stl_sc26198panelinit(stlbrd_t *brdp, stlpanel_t *panelp) | |||
4161 | int chipmask, i; | 4047 | int chipmask, i; |
4162 | int nrchips, ioaddr; | 4048 | int nrchips, ioaddr; |
4163 | 4049 | ||
4164 | #ifdef DEBUG | 4050 | pr_debug("stl_sc26198panelinit(brdp=%p,panelp=%p)\n", brdp, panelp); |
4165 | printk("stl_sc26198panelinit(brdp=%x,panelp=%x)\n", | ||
4166 | (int) brdp, (int) panelp); | ||
4167 | #endif | ||
4168 | 4051 | ||
4169 | BRDENABLE(panelp->brdnr, panelp->pagenr); | 4052 | BRDENABLE(panelp->brdnr, panelp->pagenr); |
4170 | 4053 | ||
@@ -4206,10 +4089,8 @@ static int stl_sc26198panelinit(stlbrd_t *brdp, stlpanel_t *panelp) | |||
4206 | 4089 | ||
4207 | static void stl_sc26198portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *portp) | 4090 | static void stl_sc26198portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *portp) |
4208 | { | 4091 | { |
4209 | #ifdef DEBUG | 4092 | pr_debug("stl_sc26198portinit(brdp=%p,panelp=%p,portp=%p)\n", brdp, |
4210 | printk("stl_sc26198portinit(brdp=%x,panelp=%x,portp=%x)\n", | 4093 | panelp, portp); |
4211 | (int) brdp, (int) panelp, (int) portp); | ||
4212 | #endif | ||
4213 | 4094 | ||
4214 | if ((brdp == (stlbrd_t *) NULL) || (panelp == (stlpanel_t *) NULL) || | 4095 | if ((brdp == (stlbrd_t *) NULL) || (panelp == (stlpanel_t *) NULL) || |
4215 | (portp == (stlport_t *) NULL)) | 4096 | (portp == (stlport_t *) NULL)) |
@@ -4383,15 +4264,13 @@ static void stl_sc26198setport(stlport_t *portp, struct termios *tiosp) | |||
4383 | * them all up. | 4264 | * them all up. |
4384 | */ | 4265 | */ |
4385 | 4266 | ||
4386 | #ifdef DEBUG | 4267 | pr_debug("SETPORT: portnr=%d panelnr=%d brdnr=%d\n", |
4387 | printk("SETPORT: portnr=%d panelnr=%d brdnr=%d\n", | ||
4388 | portp->portnr, portp->panelnr, portp->brdnr); | 4268 | portp->portnr, portp->panelnr, portp->brdnr); |
4389 | printk(" mr0=%x mr1=%x mr2=%x clk=%x\n", mr0, mr1, mr2, clk); | 4269 | pr_debug(" mr0=%x mr1=%x mr2=%x clk=%x\n", mr0, mr1, mr2, clk); |
4390 | printk(" iopr=%x imron=%x imroff=%x\n", iopr, imron, imroff); | 4270 | pr_debug(" iopr=%x imron=%x imroff=%x\n", iopr, imron, imroff); |
4391 | printk(" schr1=%x schr2=%x schr3=%x schr4=%x\n", | 4271 | pr_debug(" schr1=%x schr2=%x schr3=%x schr4=%x\n", |
4392 | tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP], | 4272 | tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP], |
4393 | tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP]); | 4273 | tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP]); |
4394 | #endif | ||
4395 | 4274 | ||
4396 | spin_lock_irqsave(&brd_lock, flags); | 4275 | spin_lock_irqsave(&brd_lock, flags); |
4397 | BRDENABLE(portp->brdnr, portp->pagenr); | 4276 | BRDENABLE(portp->brdnr, portp->pagenr); |
@@ -4434,10 +4313,8 @@ static void stl_sc26198setsignals(stlport_t *portp, int dtr, int rts) | |||
4434 | unsigned char iopioron, iopioroff; | 4313 | unsigned char iopioron, iopioroff; |
4435 | unsigned long flags; | 4314 | unsigned long flags; |
4436 | 4315 | ||
4437 | #ifdef DEBUG | 4316 | pr_debug("stl_sc26198setsignals(portp=%p,dtr=%d,rts=%d)\n", portp, |
4438 | printk("stl_sc26198setsignals(portp=%x,dtr=%d,rts=%d)\n", | 4317 | dtr, rts); |
4439 | (int) portp, dtr, rts); | ||
4440 | #endif | ||
4441 | 4318 | ||
4442 | iopioron = 0; | 4319 | iopioron = 0; |
4443 | iopioroff = 0; | 4320 | iopioroff = 0; |
@@ -4470,9 +4347,7 @@ static int stl_sc26198getsignals(stlport_t *portp) | |||
4470 | unsigned long flags; | 4347 | unsigned long flags; |
4471 | int sigs; | 4348 | int sigs; |
4472 | 4349 | ||
4473 | #ifdef DEBUG | 4350 | pr_debug("stl_sc26198getsignals(portp=%p)\n", portp); |
4474 | printk("stl_sc26198getsignals(portp=%x)\n", (int) portp); | ||
4475 | #endif | ||
4476 | 4351 | ||
4477 | spin_lock_irqsave(&brd_lock, flags); | 4352 | spin_lock_irqsave(&brd_lock, flags); |
4478 | BRDENABLE(portp->brdnr, portp->pagenr); | 4353 | BRDENABLE(portp->brdnr, portp->pagenr); |
@@ -4500,10 +4375,7 @@ static void stl_sc26198enablerxtx(stlport_t *portp, int rx, int tx) | |||
4500 | unsigned char ccr; | 4375 | unsigned char ccr; |
4501 | unsigned long flags; | 4376 | unsigned long flags; |
4502 | 4377 | ||
4503 | #ifdef DEBUG | 4378 | pr_debug("stl_sc26198enablerxtx(portp=%p,rx=%d,tx=%d)\n", portp, rx,tx); |
4504 | printk("stl_sc26198enablerxtx(portp=%x,rx=%d,tx=%d)\n", | ||
4505 | (int) portp, rx, tx); | ||
4506 | #endif | ||
4507 | 4379 | ||
4508 | ccr = portp->crenable; | 4380 | ccr = portp->crenable; |
4509 | if (tx == 0) | 4381 | if (tx == 0) |
@@ -4534,10 +4406,7 @@ static void stl_sc26198startrxtx(stlport_t *portp, int rx, int tx) | |||
4534 | unsigned char imr; | 4406 | unsigned char imr; |
4535 | unsigned long flags; | 4407 | unsigned long flags; |
4536 | 4408 | ||
4537 | #ifdef DEBUG | 4409 | pr_debug("stl_sc26198startrxtx(portp=%p,rx=%d,tx=%d)\n", portp, rx, tx); |
4538 | printk("stl_sc26198startrxtx(portp=%x,rx=%d,tx=%d)\n", | ||
4539 | (int) portp, rx, tx); | ||
4540 | #endif | ||
4541 | 4410 | ||
4542 | imr = portp->imr; | 4411 | imr = portp->imr; |
4543 | if (tx == 0) | 4412 | if (tx == 0) |
@@ -4569,9 +4438,7 @@ static void stl_sc26198disableintrs(stlport_t *portp) | |||
4569 | { | 4438 | { |
4570 | unsigned long flags; | 4439 | unsigned long flags; |
4571 | 4440 | ||
4572 | #ifdef DEBUG | 4441 | pr_debug("stl_sc26198disableintrs(portp=%p)\n", portp); |
4573 | printk("stl_sc26198disableintrs(portp=%x)\n", (int) portp); | ||
4574 | #endif | ||
4575 | 4442 | ||
4576 | spin_lock_irqsave(&brd_lock, flags); | 4443 | spin_lock_irqsave(&brd_lock, flags); |
4577 | BRDENABLE(portp->brdnr, portp->pagenr); | 4444 | BRDENABLE(portp->brdnr, portp->pagenr); |
@@ -4587,9 +4454,7 @@ static void stl_sc26198sendbreak(stlport_t *portp, int len) | |||
4587 | { | 4454 | { |
4588 | unsigned long flags; | 4455 | unsigned long flags; |
4589 | 4456 | ||
4590 | #ifdef DEBUG | 4457 | pr_debug("stl_sc26198sendbreak(portp=%p,len=%d)\n", portp, len); |
4591 | printk("stl_sc26198sendbreak(portp=%x,len=%d)\n", (int) portp, len); | ||
4592 | #endif | ||
4593 | 4458 | ||
4594 | spin_lock_irqsave(&brd_lock, flags); | 4459 | spin_lock_irqsave(&brd_lock, flags); |
4595 | BRDENABLE(portp->brdnr, portp->pagenr); | 4460 | BRDENABLE(portp->brdnr, portp->pagenr); |
@@ -4615,9 +4480,7 @@ static void stl_sc26198flowctrl(stlport_t *portp, int state) | |||
4615 | unsigned long flags; | 4480 | unsigned long flags; |
4616 | unsigned char mr0; | 4481 | unsigned char mr0; |
4617 | 4482 | ||
4618 | #ifdef DEBUG | 4483 | pr_debug("stl_sc26198flowctrl(portp=%p,state=%x)\n", portp, state); |
4619 | printk("stl_sc26198flowctrl(portp=%x,state=%x)\n", (int) portp, state); | ||
4620 | #endif | ||
4621 | 4484 | ||
4622 | if (portp == (stlport_t *) NULL) | 4485 | if (portp == (stlport_t *) NULL) |
4623 | return; | 4486 | return; |
@@ -4686,9 +4549,7 @@ static void stl_sc26198sendflow(stlport_t *portp, int state) | |||
4686 | unsigned long flags; | 4549 | unsigned long flags; |
4687 | unsigned char mr0; | 4550 | unsigned char mr0; |
4688 | 4551 | ||
4689 | #ifdef DEBUG | 4552 | pr_debug("stl_sc26198sendflow(portp=%p,state=%x)\n", portp, state); |
4690 | printk("stl_sc26198sendflow(portp=%x,state=%x)\n", (int) portp, state); | ||
4691 | #endif | ||
4692 | 4553 | ||
4693 | if (portp == (stlport_t *) NULL) | 4554 | if (portp == (stlport_t *) NULL) |
4694 | return; | 4555 | return; |
@@ -4725,9 +4586,7 @@ static void stl_sc26198flush(stlport_t *portp) | |||
4725 | { | 4586 | { |
4726 | unsigned long flags; | 4587 | unsigned long flags; |
4727 | 4588 | ||
4728 | #ifdef DEBUG | 4589 | pr_debug("stl_sc26198flush(portp=%p)\n", portp); |
4729 | printk("stl_sc26198flush(portp=%x)\n", (int) portp); | ||
4730 | #endif | ||
4731 | 4590 | ||
4732 | if (portp == (stlport_t *) NULL) | 4591 | if (portp == (stlport_t *) NULL) |
4733 | return; | 4592 | return; |
@@ -4756,9 +4615,7 @@ static int stl_sc26198datastate(stlport_t *portp) | |||
4756 | unsigned long flags; | 4615 | unsigned long flags; |
4757 | unsigned char sr; | 4616 | unsigned char sr; |
4758 | 4617 | ||
4759 | #ifdef DEBUG | 4618 | pr_debug("stl_sc26198datastate(portp=%p)\n", portp); |
4760 | printk("stl_sc26198datastate(portp=%x)\n", (int) portp); | ||
4761 | #endif | ||
4762 | 4619 | ||
4763 | if (portp == (stlport_t *) NULL) | 4620 | if (portp == (stlport_t *) NULL) |
4764 | return 0; | 4621 | return 0; |
@@ -4785,9 +4642,7 @@ static void stl_sc26198wait(stlport_t *portp) | |||
4785 | { | 4642 | { |
4786 | int i; | 4643 | int i; |
4787 | 4644 | ||
4788 | #ifdef DEBUG | 4645 | pr_debug("stl_sc26198wait(portp=%p)\n", portp); |
4789 | printk("stl_sc26198wait(portp=%x)\n", (int) portp); | ||
4790 | #endif | ||
4791 | 4646 | ||
4792 | if (portp == (stlport_t *) NULL) | 4647 | if (portp == (stlport_t *) NULL) |
4793 | return; | 4648 | return; |
@@ -4867,9 +4722,7 @@ static void stl_sc26198txisr(stlport_t *portp) | |||
4867 | int len, stlen; | 4722 | int len, stlen; |
4868 | char *head, *tail; | 4723 | char *head, *tail; |
4869 | 4724 | ||
4870 | #ifdef DEBUG | 4725 | pr_debug("stl_sc26198txisr(portp=%p)\n", portp); |
4871 | printk("stl_sc26198txisr(portp=%x)\n", (int) portp); | ||
4872 | #endif | ||
4873 | 4726 | ||
4874 | ioaddr = portp->ioaddr; | 4727 | ioaddr = portp->ioaddr; |
4875 | head = portp->tx.head; | 4728 | head = portp->tx.head; |
@@ -4928,9 +4781,7 @@ static void stl_sc26198rxisr(stlport_t *portp, unsigned int iack) | |||
4928 | struct tty_struct *tty; | 4781 | struct tty_struct *tty; |
4929 | unsigned int len, buflen, ioaddr; | 4782 | unsigned int len, buflen, ioaddr; |
4930 | 4783 | ||
4931 | #ifdef DEBUG | 4784 | pr_debug("stl_sc26198rxisr(portp=%p,iack=%x)\n", portp, iack); |
4932 | printk("stl_sc26198rxisr(portp=%x,iack=%x)\n", (int) portp, iack); | ||
4933 | #endif | ||
4934 | 4785 | ||
4935 | tty = portp->tty; | 4786 | tty = portp->tty; |
4936 | ioaddr = portp->ioaddr; | 4787 | ioaddr = portp->ioaddr; |
@@ -5074,9 +4925,7 @@ static void stl_sc26198otherisr(stlport_t *portp, unsigned int iack) | |||
5074 | { | 4925 | { |
5075 | unsigned char cir, ipr, xisr; | 4926 | unsigned char cir, ipr, xisr; |
5076 | 4927 | ||
5077 | #ifdef DEBUG | 4928 | pr_debug("stl_sc26198otherisr(portp=%p,iack=%x)\n", portp, iack); |
5078 | printk("stl_sc26198otherisr(portp=%x,iack=%x)\n", (int) portp, iack); | ||
5079 | #endif | ||
5080 | 4929 | ||
5081 | cir = stl_sc26198getglobreg(portp, CIR); | 4930 | cir = stl_sc26198getglobreg(portp, CIR); |
5082 | 4931 | ||