X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Fmoxa.c;fp=drivers%2Fchar%2Fmoxa.c;h=f43c2e04eadd3878d57126b154afa2b4cbdc74aa;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=a369dd6877d8afdf5f57f66def984f207b3ea581;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index a369dd687..f43c2e04e 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -29,6 +29,7 @@
  *      version         : 5.1
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/mm.h>
@@ -142,7 +143,6 @@ typedef struct _moxa_board_conf {
 
 static moxa_board_conf moxa_boards[MAX_BOARDS];
 static void __iomem *moxaBaseAddr[MAX_BOARDS];
-static int loadstat[MAX_BOARDS];
 
 struct moxa_str {
 	int type;
@@ -301,7 +301,7 @@ static struct tty_operations moxa_ops = {
 	.tiocmset = moxa_tiocmset,
 };
 
-static DEFINE_SPINLOCK(moxa_lock);
+static spinlock_t moxa_lock = SPIN_LOCK_UNLOCKED;
 
 #ifdef CONFIG_PCI
 static int moxa_get_PCI_conf(struct pci_dev *p, int board_type, moxa_board_conf * board)
@@ -342,6 +342,7 @@ static int __init moxa_init(void)
 	init_MUTEX(&moxaBuffSem);
 	moxaDriver->owner = THIS_MODULE;
 	moxaDriver->name = "ttyMX";
+	moxaDriver->devfs_name = "tts/a";
 	moxaDriver->major = ttymajor;
 	moxaDriver->minor_start = 0;
 	moxaDriver->type = TTY_DRIVER_TYPE_SERIAL;
@@ -1689,8 +1690,6 @@ int MoxaDriverPoll(void)
 	if (moxaCard == 0)
 		return (-1);
 	for (card = 0; card < MAX_BOARDS; card++) {
-	        if (loadstat[card] == 0)
-			continue;
 		if ((ports = moxa_boards[card].numPorts) == 0)
 			continue;
 		if (readb(moxaIntPend[card]) == 0xff) {
@@ -2906,7 +2905,6 @@ static int moxaloadcode(int cardno, unsigned char __user *tmp, int len)
 		}
 		break;
 	}
-	loadstat[cardno] = 1;
 	return (0);
 }
 
@@ -2924,7 +2922,7 @@ static int moxaloadc218(int cardno, void __iomem *baseAddr, int len)
 	len1 = len >> 1;
 	ptr = (ushort *) moxaBuff;
 	for (i = 0; i < len1; i++)
-		usum += le16_to_cpu(*(ptr + i));
+		usum += *(ptr + i);
 	retry = 0;
 	do {
 		len1 = len >> 1;
@@ -2996,7 +2994,7 @@ static int moxaloadc320(int cardno, void __iomem *baseAddr, int len, int *numPor
 	wlen = len >> 1;
 	uptr = (ushort *) moxaBuff;
 	for (i = 0; i < wlen; i++)
-		usum += le16_to_cpu(uptr[i]);
+		usum += uptr[i];
 	retry = 0;
 	j = 0;
 	do {