diff options
Diffstat (limited to 'drivers/staging/dgnc/dgnc_tty.c')
| -rw-r--r-- | drivers/staging/dgnc/dgnc_tty.c | 462 |
1 files changed, 168 insertions, 294 deletions
diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index a4e6c9ed799a..f81a375f8bc1 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -49,7 +49,6 @@ #include <linux/delay.h> /* For udelay */ #include <linux/uaccess.h> /* For copy_from_user/copy_to_user */ #include <linux/pci.h> - #include "dgnc_driver.h" #include "dgnc_tty.h" #include "dgnc_types.h" @@ -67,7 +66,7 @@ * internal variables */ static struct dgnc_board *dgnc_BoardsByMajor[256]; -static uchar *dgnc_TmpWriteBuf; +static unsigned char *dgnc_TmpWriteBuf; static DECLARE_MUTEX(dgnc_TmpWriteSem); /* @@ -233,7 +232,8 @@ int dgnc_tty_register(struct dgnc_board *brd) /* Register tty devices */ rc = tty_register_driver(&brd->SerialDriver); if (rc < 0) { - APR(("Can't register tty device (%d)\n", rc)); + dev_dbg(&brd->pdev->dev, + "Can't register tty device (%d)\n", rc); return rc; } brd->dgnc_Major_Serial_Registered = TRUE; @@ -281,7 +281,9 @@ int dgnc_tty_register(struct dgnc_board *brd) /* Register Transparent Print devices */ rc = tty_register_driver(&brd->PrintDriver); if (rc < 0) { - APR(("Can't register Transparent Print device (%d)\n", rc)); + dev_dbg(&brd->pdev->dev, + "Can't register Transparent Print device(%d)\n", + rc); return rc; } brd->dgnc_Major_TransparentPrint_Registered = TRUE; @@ -342,7 +344,7 @@ int dgnc_tty_init(struct dgnc_board *brd) if (!brd->channels[i]) continue; - DGNC_SPINLOCK_INIT(ch->ch_lock); + spin_lock_init(&ch->ch_lock); /* Store all our magic numbers */ ch->magic = DGNC_CHANNEL_MAGIC; @@ -371,10 +373,10 @@ int dgnc_tty_init(struct dgnc_board *brd) init_waitqueue_head(&ch->ch_flags_wait); init_waitqueue_head(&ch->ch_tun.un_flags_wait); init_waitqueue_head(&ch->ch_pun.un_flags_wait); - init_waitqueue_head(&ch->ch_sniff_wait); { struct device *classp; + classp = tty_register_device(&brd->SerialDriver, i, &(ch->ch_bd->pdev->dev)); ch->ch_tun.un_sysfs = classp; @@ -445,127 +447,6 @@ void dgnc_tty_uninit(struct dgnc_board *brd) #define TMPBUFLEN (1024) -/* - * dgnc_sniff - Dump data out to the "sniff" buffer if the - * proc sniff file is opened... - */ -void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int len) -{ - struct timeval tv; - int n; - int r; - int nbuf; - int i; - int tmpbuflen; - char *tmpbuf; - char *p; - int too_much_data; - - tmpbuf = kzalloc(TMPBUFLEN, GFP_ATOMIC); - if (!tmpbuf) - return; - p = tmpbuf; - - /* Leave if sniff not open */ - if (!(ch->ch_sniff_flags & SNIFF_OPEN)) - goto exit; - - do_gettimeofday(&tv); - - /* Create our header for data dump */ - p += sprintf(p, "<%ld %ld><%s><", tv.tv_sec, tv.tv_usec, text); - tmpbuflen = p - tmpbuf; - - do { - too_much_data = 0; - - for (i = 0; i < len && tmpbuflen < (TMPBUFLEN - 4); i++) { - p += sprintf(p, "%02x ", *buf); - buf++; - tmpbuflen = p - tmpbuf; - } - - if (tmpbuflen < (TMPBUFLEN - 4)) { - if (i > 0) - p += sprintf(p - 1, "%s\n", ">"); - else - p += sprintf(p, "%s\n", ">"); - } else { - too_much_data = 1; - len -= i; - } - - nbuf = strlen(tmpbuf); - p = tmpbuf; - - /* - * Loop while data remains. - */ - while (nbuf > 0 && ch->ch_sniff_buf) { - /* - * Determine the amount of available space left in the - * buffer. If there's none, wait until some appears. - */ - n = (ch->ch_sniff_out - ch->ch_sniff_in - 1) & SNIFF_MASK; - - /* - * If there is no space left to write to in our sniff buffer, - * we have no choice but to drop the data. - * We *cannot* sleep here waiting for space, because this - * function was probably called by the interrupt/timer routines! - */ - if (n == 0) - goto exit; - - /* - * Copy as much data as will fit. - */ - - if (n > nbuf) - n = nbuf; - - r = SNIFF_MAX - ch->ch_sniff_in; - - if (r <= n) { - memcpy(ch->ch_sniff_buf + ch->ch_sniff_in, p, r); - - n -= r; - ch->ch_sniff_in = 0; - p += r; - nbuf -= r; - } - - memcpy(ch->ch_sniff_buf + ch->ch_sniff_in, p, n); - - ch->ch_sniff_in += n; - p += n; - nbuf -= n; - - /* - * Wakeup any thread waiting for data - */ - if (ch->ch_sniff_flags & SNIFF_WAIT_DATA) { - ch->ch_sniff_flags &= ~SNIFF_WAIT_DATA; - wake_up_interruptible(&ch->ch_sniff_wait); - } - } - - /* - * If the user sent us too much data to push into our tmpbuf, - * we need to keep looping around on all the data. - */ - if (too_much_data) { - p = tmpbuf; - tmpbuflen = 0; - } - - } while (too_much_data); - -exit: - kfree(tmpbuf); -} - - /*======================================================================= * * dgnc_wmove - Write data to transmit queue. @@ -631,7 +512,7 @@ void dgnc_input(struct channel_t *ch) ushort head; ushort tail; int data_len; - ulong lock_flags; + unsigned long flags; int flip_len; int len = 0; int n = 0; @@ -647,7 +528,7 @@ void dgnc_input(struct channel_t *ch) if (!bd || bd->magic != DGNC_BOARD_MAGIC) return; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* * Figure the number of characters in the buffer. @@ -659,7 +540,7 @@ void dgnc_input(struct channel_t *ch) data_len = (head - tail) & rmask; if (data_len == 0) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return; } @@ -675,7 +556,7 @@ void dgnc_input(struct channel_t *ch) /* Force queue flow control to be released, if needed */ dgnc_check_queue_flow_control(ch); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return; } @@ -683,7 +564,7 @@ void dgnc_input(struct channel_t *ch) * If we are throttled, simply don't read any data. */ if (ch->ch_flags & CH_FORCED_STOPI) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return; } @@ -724,7 +605,7 @@ void dgnc_input(struct channel_t *ch) } if (len <= 0) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (ld) tty_ldisc_deref(ld); return; @@ -780,8 +661,6 @@ void dgnc_input(struct channel_t *ch) tty_insert_flip_string(tp->port, ch->ch_rqueue + tail, s); } - dgnc_sniff_nowait_nolock(ch, "USER READ", ch->ch_rqueue + tail, s); - tail += s; n -= s; /* Flip queue if needed */ @@ -791,7 +670,7 @@ void dgnc_input(struct channel_t *ch) ch->ch_r_tail = tail & rmask; ch->ch_e_tail = tail & rmask; dgnc_check_queue_flow_control(ch); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); /* Tell the tty layer its okay to "eat" the data now */ tty_flip_buffer_push(tp->port); @@ -1052,12 +931,12 @@ void dgnc_check_queue_flow_control(struct channel_t *ch) void dgnc_wakeup_writes(struct channel_t *ch) { int qlen = 0; - ulong lock_flags; + unsigned long flags; if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) return; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* * If channel now has space, wake up anyone waiting on the condition. @@ -1067,16 +946,16 @@ void dgnc_wakeup_writes(struct channel_t *ch) qlen += WQUEUESIZE; if (qlen >= (WQUEUESIZE - 256)) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return; } if (ch->ch_tun.un_flags & UN_ISOPEN) { if ((ch->ch_tun.un_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && ch->ch_tun.un_tty->ldisc->ops->write_wakeup) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); (ch->ch_tun.un_tty->ldisc->ops->write_wakeup)(ch->ch_tun.un_tty); - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); } wake_up_interruptible(&ch->ch_tun.un_tty->write_wait); @@ -1115,9 +994,9 @@ void dgnc_wakeup_writes(struct channel_t *ch) if (ch->ch_pun.un_flags & UN_ISOPEN) { if ((ch->ch_pun.un_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && ch->ch_pun.un_tty->ldisc->ops->write_wakeup) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); (ch->ch_pun.un_tty->ldisc->ops->write_wakeup)(ch->ch_pun.un_tty); - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); } wake_up_interruptible(&ch->ch_pun.un_tty->write_wait); @@ -1127,15 +1006,14 @@ void dgnc_wakeup_writes(struct channel_t *ch) * the queue AND FIFO are both empty. */ if (ch->ch_pun.un_flags & UN_EMPTY) { - if ((qlen == 0) && (ch->ch_bd->bd_ops->get_uart_bytes_left(ch) == 0)) { + if ((qlen == 0) && (ch->ch_bd->bd_ops->get_uart_bytes_left(ch) == 0)) ch->ch_pun.un_flags &= ~(UN_EMPTY); - } } wake_up_interruptible(&ch->ch_pun.un_flags_wait); } - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } @@ -1158,7 +1036,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) uint major = 0; uint minor = 0; int rc = 0; - ulong lock_flags; + unsigned long flags; rc = 0; @@ -1183,25 +1061,25 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) if (rc) return rc; - DGNC_LOCK(brd->bd_lock, lock_flags); + spin_lock_irqsave(&brd->bd_lock, flags); /* If opened device is greater than our number of ports, bail. */ if (PORT_NUM(minor) > brd->nasync) { - DGNC_UNLOCK(brd->bd_lock, lock_flags); + spin_unlock_irqrestore(&brd->bd_lock, flags); return -ENXIO; } ch = brd->channels[PORT_NUM(minor)]; if (!ch) { - DGNC_UNLOCK(brd->bd_lock, lock_flags); + spin_unlock_irqrestore(&brd->bd_lock, flags); return -ENXIO; } /* Drop board lock */ - DGNC_UNLOCK(brd->bd_lock, lock_flags); + spin_unlock_irqrestore(&brd->bd_lock, flags); /* Grab channel lock */ - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* Figure out our type */ if (!IS_PRINT(minor)) { @@ -1211,7 +1089,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) un = &brd->channels[PORT_NUM(minor)]->ch_pun; un->un_type = DGNC_PRINT; } else { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return -ENXIO; } @@ -1220,7 +1098,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) * where we simply cannot safely keep going, wait until the * state clears. */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = wait_event_interruptible(ch->ch_flags_wait, ((ch->ch_flags & CH_OPENING) == 0)); @@ -1242,7 +1120,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) if (rc) return -EINTR; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* Store our unit into driver_data, so we always have it available. */ @@ -1267,7 +1145,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) ch->ch_flags |= (CH_OPENING); /* Drop locks, as malloc with GFP_KERNEL can sleep */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (!ch->ch_rqueue) ch->ch_rqueue = kzalloc(RQUEUESIZE, GFP_KERNEL); @@ -1276,7 +1154,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) if (!ch->ch_wqueue) ch->ch_wqueue = kzalloc(WQUEUESIZE, GFP_KERNEL); - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_flags &= ~(CH_OPENING); wake_up_interruptible(&ch->ch_flags_wait); @@ -1335,16 +1213,16 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) * follow protocol for opening port */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = dgnc_block_til_ready(tty, file, ch); /* No going back now, increment our unit and channel counters */ - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_open_count++; un->un_open_count++; un->un_flags |= (UN_ISOPEN); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return rc; } @@ -1359,19 +1237,18 @@ static int dgnc_block_til_ready(struct tty_struct *tty, struct file *file, struc { int retval = 0; struct un_t *un = NULL; - ulong lock_flags; + unsigned long flags; uint old_flags = 0; int sleep_on_un_flags = 0; - if (!tty || tty->magic != TTY_MAGIC || !file || !ch || ch->magic != DGNC_CHANNEL_MAGIC) { + if (!tty || tty->magic != TTY_MAGIC || !file || !ch || ch->magic != DGNC_CHANNEL_MAGIC) return -ENXIO; - } un = tty->driver_data; if (!un || un->magic != DGNC_UNIT_MAGIC) return -ENXIO; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_wopen++; @@ -1451,7 +1328,7 @@ static int dgnc_block_til_ready(struct tty_struct *tty, struct file *file, struc * eventually goes active. */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); /* * Wait for something in the flags to change from the current value. @@ -1467,12 +1344,12 @@ static int dgnc_block_til_ready(struct tty_struct *tty, struct file *file, struc * We got woken up for some reason. * Before looping around, grab our channel lock. */ - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); } ch->ch_wopen--; - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (retval) return retval; @@ -1513,7 +1390,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) struct dgnc_board *bd; struct channel_t *ch; struct un_t *un; - ulong lock_flags; + unsigned long flags; int rc = 0; if (!tty || tty->magic != TTY_MAGIC) @@ -1533,7 +1410,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) ts = &tty->termios; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* * Determine if this is the last close or not - and if we agree about @@ -1547,19 +1424,23 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) * one, we've got real problems, since it means the * serial port won't be shutdown. */ - APR(("tty->count is 1, un open count is %d\n", un->un_open_count)); + dev_dbg(tty->dev, + "tty->count is 1, un open count is %d\n", + un->un_open_count); un->un_open_count = 1; } if (un->un_open_count) un->un_open_count--; else - APR(("bad serial port open count of %d\n", un->un_open_count)); + dev_dbg(tty->dev, + "bad serial port open count of %d\n", + un->un_open_count); ch->ch_open_count--; if (ch->ch_open_count && un->un_open_count) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return; } @@ -1586,7 +1467,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) ch->ch_flags &= ~CH_PRON; } - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); /* wait for output to drain */ /* This will also return if we take an interrupt */ @@ -1595,7 +1476,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) dgnc_tty_flush_buffer(tty); tty_ldisc_flush(tty); - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); tty->closing = 0; @@ -1613,9 +1494,10 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) * have been dropped for modems to see it. */ if (ch->ch_close_delay) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, + flags); dgnc_ms_sleep(ch->ch_close_delay); - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); } } @@ -1640,7 +1522,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) wake_up_interruptible(&ch->ch_flags_wait); wake_up_interruptible(&un->un_flags_wait); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } @@ -1660,7 +1542,7 @@ static int dgnc_tty_chars_in_buffer(struct tty_struct *tty) ushort ttail; uint tmask; uint chars = 0; - ulong lock_flags = 0; + unsigned long flags; if (tty == NULL) return 0; @@ -1673,13 +1555,13 @@ static int dgnc_tty_chars_in_buffer(struct tty_struct *tty) if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) return 0; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); tmask = WQUEUEMASK; thead = ch->ch_w_head & tmask; ttail = ch->ch_w_tail & tmask; - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (ttail == thead) { chars = 0; @@ -1763,7 +1645,7 @@ static int dgnc_tty_write_room(struct tty_struct *tty) ushort tail; ushort tmask; int ret = 0; - ulong lock_flags = 0; + unsigned long flags; if (tty == NULL || dgnc_TmpWriteBuf == NULL) return 0; @@ -1776,7 +1658,7 @@ static int dgnc_tty_write_room(struct tty_struct *tty) if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) return 0; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); tmask = WQUEUEMASK; head = (ch->ch_w_head) & tmask; @@ -1805,7 +1687,7 @@ static int dgnc_tty_write_room(struct tty_struct *tty) if (ret < 0) ret = 0; - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return ret; } @@ -1841,7 +1723,7 @@ static int dgnc_tty_write(struct tty_struct *tty, struct un_t *un = NULL; int bufcount = 0, n = 0; int orig_count = 0; - ulong lock_flags; + unsigned long flags; ushort head; ushort tail; ushort tmask; @@ -1869,7 +1751,7 @@ static int dgnc_tty_write(struct tty_struct *tty, */ orig_count = count; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* Get our space available for the channel from the board */ tmask = WQUEUEMASK; @@ -1896,7 +1778,7 @@ static int dgnc_tty_write(struct tty_struct *tty, * Bail if no space left. */ if (count <= 0) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; } @@ -1926,7 +1808,7 @@ static int dgnc_tty_write(struct tty_struct *tty, * If there is nothing left to copy, or I can't handle any more data, leave. */ if (count <= 0) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; } @@ -1934,7 +1816,7 @@ static int dgnc_tty_write(struct tty_struct *tty, count = min(count, WRITEBUFLEN); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); /* * If data is coming from user space, copy it into a temporary @@ -1949,14 +1831,14 @@ static int dgnc_tty_write(struct tty_struct *tty, * copy_from_user() returns the number * of bytes that could *NOT* be copied. */ - count -= copy_from_user(dgnc_TmpWriteBuf, (const uchar __user *) buf, count); + count -= copy_from_user(dgnc_TmpWriteBuf, (const unsigned char __user *) buf, count); if (!count) { up(&dgnc_TmpWriteSem); return -EFAULT; } - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); buf = dgnc_TmpWriteBuf; @@ -1974,7 +1856,6 @@ static int dgnc_tty_write(struct tty_struct *tty, if (n >= remain) { n -= remain; memcpy(ch->ch_wqueue + head, buf, remain); - dgnc_sniff_nowait_nolock(ch, "USER WRITE", ch->ch_wqueue + head, remain); head = 0; buf += remain; } @@ -1985,7 +1866,6 @@ static int dgnc_tty_write(struct tty_struct *tty, */ remain = n; memcpy(ch->ch_wqueue + head, buf, remain); - dgnc_sniff_nowait_nolock(ch, "USER WRITE", ch->ch_wqueue + head, remain); head += remain; } @@ -2001,10 +1881,10 @@ static int dgnc_tty_write(struct tty_struct *tty, } if (from_user) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); up(&dgnc_TmpWriteSem); } else { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } if (count) { @@ -2028,8 +1908,8 @@ static int dgnc_tty_tiocmget(struct tty_struct *tty) struct channel_t *ch; struct un_t *un; int result = -EIO; - uchar mstat = 0; - ulong lock_flags; + unsigned char mstat = 0; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return result; @@ -2042,11 +1922,11 @@ static int dgnc_tty_tiocmget(struct tty_struct *tty) if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) return result; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); mstat = (ch->ch_mostat | ch->ch_mistat); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); result = 0; @@ -2080,7 +1960,7 @@ static int dgnc_tty_tiocmset(struct tty_struct *tty, struct channel_t *ch; struct un_t *un; int ret = -EIO; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return ret; @@ -2097,7 +1977,7 @@ static int dgnc_tty_tiocmset(struct tty_struct *tty, if (!bd || bd->magic != DGNC_BOARD_MAGIC) return ret; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); if (set & TIOCM_RTS) ch->ch_mostat |= UART_MCR_RTS; @@ -2113,7 +1993,7 @@ static int dgnc_tty_tiocmset(struct tty_struct *tty, ch->ch_bd->bd_ops->assert_modem_signals(ch); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; } @@ -2130,7 +2010,7 @@ static int dgnc_tty_send_break(struct tty_struct *tty, int msec) struct channel_t *ch; struct un_t *un; int ret = -EIO; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return ret; @@ -2158,11 +2038,11 @@ static int dgnc_tty_send_break(struct tty_struct *tty, int msec) break; } - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_bd->bd_ops->send_break(ch, msec); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; @@ -2197,8 +2077,6 @@ static void dgnc_tty_wait_until_sent(struct tty_struct *tty, int timeout) return; rc = bd->bd_ops->drain(tty, 0); - - return; } @@ -2212,7 +2090,7 @@ static void dgnc_tty_send_xchar(struct tty_struct *tty, char c) struct dgnc_board *bd; struct channel_t *ch; struct un_t *un; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return; @@ -2231,12 +2109,11 @@ static void dgnc_tty_send_xchar(struct tty_struct *tty, char c) dev_dbg(tty->dev, "dgnc_tty_send_xchar start\n"); - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); bd->bd_ops->send_immediate_char(ch, c); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); dev_dbg(tty->dev, "dgnc_tty_send_xchar finish\n"); - return; } @@ -2249,16 +2126,16 @@ static inline int dgnc_get_mstat(struct channel_t *ch) { unsigned char mstat; int result = -EIO; - ulong lock_flags; + unsigned long flags; if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) return -ENXIO; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); mstat = (ch->ch_mostat | ch->ch_mistat); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); result = 0; @@ -2311,7 +2188,7 @@ static int dgnc_set_modem_info(struct tty_struct *tty, unsigned int command, uns struct un_t *un; int ret = -ENXIO; unsigned int arg = 0; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return ret; @@ -2328,8 +2205,6 @@ static int dgnc_set_modem_info(struct tty_struct *tty, unsigned int command, uns if (!bd || bd->magic != DGNC_BOARD_MAGIC) return ret; - ret = 0; - ret = get_user(arg, value); if (ret) return ret; @@ -2371,11 +2246,11 @@ static int dgnc_set_modem_info(struct tty_struct *tty, unsigned int command, uns return -EINVAL; } - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_bd->bd_ops->assert_modem_signals(ch); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; } @@ -2394,7 +2269,7 @@ static int dgnc_tty_digigeta(struct tty_struct *tty, struct digi_t __user *retin struct channel_t *ch; struct un_t *un; struct digi_t tmp; - ulong lock_flags; + unsigned long flags; if (!retinfo) return -EFAULT; @@ -2412,9 +2287,9 @@ static int dgnc_tty_digigeta(struct tty_struct *tty, struct digi_t __user *retin memset(&tmp, 0, sizeof(tmp)); - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); memcpy(&tmp, &ch->ch_digi, sizeof(tmp)); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) return -EFAULT; @@ -2437,7 +2312,7 @@ static int dgnc_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_i struct channel_t *ch; struct un_t *un; struct digi_t new_digi; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return -EFAULT; @@ -2457,7 +2332,7 @@ static int dgnc_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_i if (copy_from_user(&new_digi, new_info, sizeof(new_digi))) return -EFAULT; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* * Handle transistions to and from RTS Toggle. @@ -2500,7 +2375,7 @@ static int dgnc_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_i ch->ch_bd->bd_ops->param(tty); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; } @@ -2514,7 +2389,7 @@ static void dgnc_tty_set_termios(struct tty_struct *tty, struct ktermios *old_te struct dgnc_board *bd; struct channel_t *ch; struct un_t *un; - unsigned long lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return; @@ -2531,7 +2406,7 @@ static void dgnc_tty_set_termios(struct tty_struct *tty, struct ktermios *old_te if (!bd || bd->magic != DGNC_BOARD_MAGIC) return; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_c_cflag = tty->termios.c_cflag; ch->ch_c_iflag = tty->termios.c_iflag; @@ -2543,7 +2418,7 @@ static void dgnc_tty_set_termios(struct tty_struct *tty, struct ktermios *old_te ch->ch_bd->bd_ops->param(tty); dgnc_carrier(ch); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } @@ -2551,7 +2426,7 @@ static void dgnc_tty_throttle(struct tty_struct *tty) { struct channel_t *ch; struct un_t *un; - ulong lock_flags = 0; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return; @@ -2564,11 +2439,11 @@ static void dgnc_tty_throttle(struct tty_struct *tty) if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) return; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_flags |= (CH_FORCED_STOPI); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } @@ -2576,7 +2451,7 @@ static void dgnc_tty_unthrottle(struct tty_struct *tty) { struct channel_t *ch; struct un_t *un; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return; @@ -2589,11 +2464,11 @@ static void dgnc_tty_unthrottle(struct tty_struct *tty) if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) return; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_flags &= ~(CH_FORCED_STOPI); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } @@ -2602,7 +2477,7 @@ static void dgnc_tty_start(struct tty_struct *tty) struct dgnc_board *bd; struct channel_t *ch; struct un_t *un; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return; @@ -2619,11 +2494,11 @@ static void dgnc_tty_start(struct tty_struct *tty) if (!bd || bd->magic != DGNC_BOARD_MAGIC) return; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_flags &= ~(CH_FORCED_STOP); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } @@ -2632,7 +2507,7 @@ static void dgnc_tty_stop(struct tty_struct *tty) struct dgnc_board *bd; struct channel_t *ch; struct un_t *un; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return; @@ -2649,11 +2524,11 @@ static void dgnc_tty_stop(struct tty_struct *tty) if (!bd || bd->magic != DGNC_BOARD_MAGIC) return; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_flags |= (CH_FORCED_STOP); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } @@ -2675,7 +2550,7 @@ static void dgnc_tty_flush_chars(struct tty_struct *tty) struct dgnc_board *bd; struct channel_t *ch; struct un_t *un; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return; @@ -2692,11 +2567,11 @@ static void dgnc_tty_flush_chars(struct tty_struct *tty) if (!bd || bd->magic != DGNC_BOARD_MAGIC) return; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* Do something maybe here */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } @@ -2710,7 +2585,7 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty) { struct channel_t *ch; struct un_t *un; - ulong lock_flags; + unsigned long flags; if (!tty || tty->magic != TTY_MAGIC) return; @@ -2723,7 +2598,7 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty) if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) return; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_flags &= ~CH_STOP; @@ -2742,7 +2617,7 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty) wake_up_interruptible(&ch->ch_pun.un_flags_wait); } - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); } @@ -2765,7 +2640,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, struct channel_t *ch; struct un_t *un; int rc; - ulong lock_flags; + unsigned long flags; void __user *uarg = (void __user *) arg; if (!tty || tty->magic != TTY_MAGIC) @@ -2783,10 +2658,10 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, if (!bd || bd->magic != DGNC_BOARD_MAGIC) return -ENODEV; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); if (un->un_open_count <= 0) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return -EIO; } @@ -2804,7 +2679,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, * in the middle: 0.375 seconds. */ rc = tty_check_change(tty); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (rc) return rc; @@ -2813,13 +2688,12 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, if (rc) return -EINTR; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); - if (((cmd == TCSBRK) && (!arg)) || (cmd == TCSBRKP)) { + if (((cmd == TCSBRK) && (!arg)) || (cmd == TCSBRKP)) ch->ch_bd->bd_ops->send_break(ch, 250); - } - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; @@ -2831,7 +2705,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, * in the middle: 0.375 seconds. */ rc = tty_check_change(tty); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (rc) return rc; @@ -2839,17 +2713,17 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, if (rc) return -EINTR; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_bd->bd_ops->send_break(ch, 250); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; case TIOCSBRK: rc = tty_check_change(tty); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (rc) return rc; @@ -2857,48 +2731,48 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, if (rc) return -EINTR; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_bd->bd_ops->send_break(ch, 250); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; case TIOCCBRK: /* Do Nothing */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; case TIOCGSOFTCAR: - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) arg); return rc; case TIOCSSOFTCAR: - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = get_user(arg, (unsigned long __user *) arg); if (rc) return rc; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); tty->termios.c_cflag = ((tty->termios.c_cflag & ~CLOCAL) | (arg ? CLOCAL : 0)); ch->ch_bd->bd_ops->param(tty); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; case TIOCMGET: - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return dgnc_get_modem_info(ch, uarg); case TIOCMBIS: case TIOCMBIC: case TIOCMSET: - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return dgnc_set_modem_info(tty, cmd, uarg); /* @@ -2917,7 +2791,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, */ rc = tty_check_change(tty); if (rc) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return rc; } @@ -2947,7 +2821,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, } /* pretend we didn't recognize this IOCTL */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return -ENOIOCTLCMD; case TCSETSF: case TCSETSW: @@ -2970,7 +2844,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, } /* now wait for all the output to drain */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = ch->ch_bd->bd_ops->drain(tty, 0); if (rc) return -EINTR; @@ -2980,7 +2854,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, case TCSETAW: - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = ch->ch_bd->bd_ops->drain(tty, 0); if (rc) return -EINTR; @@ -2989,13 +2863,13 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, return -ENOIOCTLCMD; case TCXONC: - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); /* Make the ld do it */ return -ENOIOCTLCMD; case DIGI_GETA: /* get information for ditty */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return dgnc_tty_digigeta(tty, uarg); case DIGI_SETAW: @@ -3004,31 +2878,31 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, /* set information for ditty */ if (cmd == (DIGI_SETAW)) { - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = ch->ch_bd->bd_ops->drain(tty, 0); if (rc) return -EINTR; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); } else { tty_ldisc_flush(tty); } /* fall thru */ case DIGI_SETA: - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return dgnc_tty_digiseta(tty, uarg); case DIGI_LOOPBACK: { uint loopback = 0; /* Let go of locks when accessing user space, could sleep */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = get_user(loopback, (unsigned int __user *) arg); if (rc) return rc; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* Enable/disable internal loopback for this port */ if (loopback) @@ -3037,12 +2911,12 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, ch->ch_flags &= ~(CH_LOOPBACK); ch->ch_bd->bd_ops->param(tty); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; } case DIGI_GETCUSTOMBAUD: - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = put_user(ch->ch_custom_speed, (unsigned int __user *) arg); return rc; @@ -3050,14 +2924,14 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, { int new_rate; /* Let go of locks when accessing user space, could sleep */ - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = get_user(new_rate, (int __user *) arg); if (rc) return rc; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); dgnc_set_custom_speed(ch, new_rate); ch->ch_bd->bd_ops->param(tty); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; } @@ -3071,13 +2945,14 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, case DIGI_REALPORT_SENDIMMEDIATE: { unsigned char c; - DGNC_UNLOCK(ch->ch_lock, lock_flags); + + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = get_user(c, (unsigned char __user *) arg); if (rc) return rc; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); ch->ch_bd->bd_ops->send_immediate_char(ch, c); - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return 0; } @@ -3092,14 +2967,14 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, struct digi_getcounter buf; buf.norun = ch->ch_err_overrun; - buf.noflow = 0; /* The driver doesn't keep this stat */ + buf.noflow = 0; /* The driver doesn't keep this stat */ buf.nframe = ch->ch_err_frame; buf.nparity = ch->ch_err_parity; buf.nbreak = ch->ch_err_break; buf.rbytes = ch->ch_rxcount; buf.tbytes = ch->ch_txcount; - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (copy_to_user(uarg, &buf, sizeof(buf))) return -EFAULT; @@ -3123,11 +2998,10 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, if ((ch->ch_flags & CH_STOP) || (ch->ch_flags & CH_FORCED_STOP)) events |= (EV_OPU | EV_OPS); - if ((ch->ch_flags & CH_STOPI) || (ch->ch_flags & CH_FORCED_STOPI)) { + if ((ch->ch_flags & CH_STOPI) || (ch->ch_flags & CH_FORCED_STOPI)) events |= (EV_IPU | EV_IPS); - } - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); rc = put_user(events, (unsigned int __user *) arg); return rc; } @@ -3144,7 +3018,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, int tdist; int count; - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); /* * Get data from user first. @@ -3152,7 +3026,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, if (copy_from_user(&buf, uarg, sizeof(buf))) return -EFAULT; - DGNC_LOCK(ch->ch_lock, lock_flags); + spin_lock_irqsave(&ch->ch_lock, flags); /* * Figure out how much data is in our RX and TX queues. @@ -3190,7 +3064,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, else buf.txdone = 1; - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); if (copy_to_user(uarg, &buf, sizeof(buf))) return -EFAULT; @@ -3198,7 +3072,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, return 0; } default: - DGNC_UNLOCK(ch->ch_lock, lock_flags); + spin_unlock_irqrestore(&ch->ch_lock, flags); return -ENOIOCTLCMD; } |