Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

[safe/jmp/linux-2.6] / drivers / char / moxa.c

diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index ac06d01..107b0bd 100644 (file)
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -34,7 +34,6 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/major.h>
-#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
@@ -44,6 +43,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
+#include <linux/slab.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -164,24 +164,26 @@ static struct mon_str moxaLog;
 static unsigned int moxaFuncTout = HZ / 2;
 static unsigned int moxaLowWaterChk;
 static DEFINE_MUTEX(moxa_openlock);
-/* Variables for insmod */
-#ifdef MODULE
+static DEFINE_SPINLOCK(moxa_lock);
+
 static unsigned long baseaddr[MAX_BOARDS];
 static unsigned int type[MAX_BOARDS];
 static unsigned int numports[MAX_BOARDS];
-#endif
 
 MODULE_AUTHOR("William Chen");
 MODULE_DESCRIPTION("MOXA Intellio Family Multiport Board Device Driver");
 MODULE_LICENSE("GPL");
-#ifdef MODULE
+MODULE_FIRMWARE("c218tunx.cod");
+MODULE_FIRMWARE("cp204unx.cod");
+MODULE_FIRMWARE("c320tunx.cod");
+
 module_param_array(type, uint, NULL, 0);
 MODULE_PARM_DESC(type, "card type: C218=2, C320=4");
 module_param_array(baseaddr, ulong, NULL, 0);
 MODULE_PARM_DESC(baseaddr, "base address");
 module_param_array(numports, uint, NULL, 0);
 MODULE_PARM_DESC(numports, "numports (ignored for C218)");
-#endif
+
 module_param(ttymajor, int, 0);
 
 /*
@@ -202,7 +204,6 @@ static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
                         unsigned int set, unsigned int clear);
 static void moxa_poll(unsigned long);
 static void moxa_set_tty_param(struct tty_struct *, struct ktermios *);
-static void moxa_setup_empty_event(struct tty_struct *);
 static void moxa_shutdown(struct tty_port *);
 static int moxa_carrier_raised(struct tty_port *);
 static void moxa_dtr_rts(struct tty_port *, int);
@@ -315,22 +316,20 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
                struct moxa_port *p;
                unsigned int i, j;
 
-               mutex_lock(&moxa_openlock);
                for (i = 0; i < MAX_BOARDS; i++) {
                        p = moxa_boards[i].ports;
                        for (j = 0; j < MAX_PORTS_PER_BOARD; j++, p++, argm++) {
                                memset(&tmp, 0, sizeof(tmp));
+                               spin_lock_bh(&moxa_lock);
                                if (moxa_boards[i].ready) {
                                        tmp.inq = MoxaPortRxQueue(p);
                                        tmp.outq = MoxaPortTxQueue(p);
                                }
-                               if (copy_to_user(argm, &tmp, sizeof(tmp))) {
-                                       mutex_unlock(&moxa_openlock);
+                               spin_unlock_bh(&moxa_lock);
+                               if (copy_to_user(argm, &tmp, sizeof(tmp)))
                                        return -EFAULT;
-                               }
                        }
                }
-               mutex_unlock(&moxa_openlock);
                break;
        } case MOXA_GET_OQUEUE:
                status = MoxaPortTxQueue(ch);
@@ -346,16 +345,20 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
                struct moxa_port *p;
                unsigned int i, j;
 
-               mutex_lock(&moxa_openlock);
                for (i = 0; i < MAX_BOARDS; i++) {
                        p = moxa_boards[i].ports;
                        for (j = 0; j < MAX_PORTS_PER_BOARD; j++, p++, argm++) {
                                struct tty_struct *ttyp;
                                memset(&tmp, 0, sizeof(tmp));
-                               if (!moxa_boards[i].ready)
+                               spin_lock_bh(&moxa_lock);
+                               if (!moxa_boards[i].ready) {
+                                       spin_unlock_bh(&moxa_lock);
                                        goto copy;
+                                }
 
                                status = MoxaPortLineStatus(p);
+                               spin_unlock_bh(&moxa_lock);
+
                                if (status & 1)
                                        tmp.cts = 1;
                                if (status & 2)
@@ -370,13 +373,10 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
                                        tmp.cflag = ttyp->termios->c_cflag;
                                tty_kref_put(tty);
 copy:
-                               if (copy_to_user(argm, &tmp, sizeof(tmp))) {
-                                       mutex_unlock(&moxa_openlock);
+                               if (copy_to_user(argm, &tmp, sizeof(tmp)))
                                        return -EFAULT;
-                               }
                        }
                }
-               mutex_unlock(&moxa_openlock);
                break;
        }
        case TIOCGSERIAL:
@@ -429,7 +429,6 @@ static const struct tty_port_operations moxa_port_ops = {
 
 static struct tty_driver *moxaDriver;
 static DEFINE_TIMER(moxaTimer, moxa_poll, 0, 0);
-static DEFINE_SPINLOCK(moxa_lock);
 
 /*
  * HW init
@@ -1027,6 +1026,8 @@ static int __init moxa_init(void)
 {
        unsigned int isabrds = 0;
        int retval = 0;
+       struct moxa_board_conf *brd = moxa_boards;
+       unsigned int i;
 
        printk(KERN_INFO "MOXA Intellio family driver version %s\n",
                        MOXA_VERSION);
@@ -1054,10 +1055,7 @@ static int __init moxa_init(void)
        }
 
        /* Find the boards defined from module args. */
-#ifdef MODULE
-       {
-       struct moxa_board_conf *brd = moxa_boards;
-       unsigned int i;
+
        for (i = 0; i < MAX_BOARDS; i++) {
                if (!baseaddr[i])
                        break;
@@ -1090,8 +1088,6 @@ static int __init moxa_init(void)
                        isabrds++;
                }
        }
-       }
-#endif
 
 #ifdef CONFIG_PCI
        retval = pci_register_driver(&moxa_pci_driver);
@@ -1251,17 +1247,13 @@ static int moxa_chars_in_buffer(struct tty_struct *tty)
        struct moxa_port *ch = tty->driver_data;
        int chars;
 
-       lock_kernel();
        chars = MoxaPortTxQueue(ch);
-       if (chars) {
+       if (chars)
                /*
                 * Make it possible to wakeup anything waiting for output
                 * in tty_ioctl.c, etc.
                 */
-               if (!test_bit(EMPTYWAIT, &ch->statusflags))
-                       moxa_setup_empty_event(tty);
-       }
-       unlock_kernel();
+               set_bit(EMPTYWAIT, &ch->statusflags);
        return chars;
 }
 
@@ -1503,12 +1495,6 @@ static void moxa_set_tty_param(struct tty_struct *tty, struct ktermios *old_term
        tty_encode_baud_rate(tty, baud, baud);
 }
 
-static void moxa_setup_empty_event(struct tty_struct *tty)
-{
-       struct moxa_port *ch = tty->driver_data;
-       set_bit(EMPTYWAIT, &ch->statusflags);
-}
-
 /*****************************************************************************
  *     Driver level functions:                                              *
  *****************************************************************************/