1 files changed, 44 insertions, 83 deletions

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 196c8794a73..738bd7c7451 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -37,6 +37,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/mutex.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/signal.h>
@@ -52,6 +53,7 @@
 #include <linux/vmalloc.h>
 
 #include "sisusb.h"
+#include "sisusb_init.h"
 
 #ifdef INCL_SISUSB_CON
 #include <linux/font.h>
@@ -62,36 +64,6 @@
 /* Forward declarations / clean-up routines */
 
 #ifdef INCL_SISUSB_CON
-int     sisusb_setreg(struct sisusb_usb_data *sisusb, int port, u8 data);
-int     sisusb_getreg(struct sisusb_usb_data *sisusb, int port, u8 *data);
-int     sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data);
-int     sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data);
-int     sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand, u8 myor);
-int     sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port, u8 index, u8 myor);
-int     sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand);
-
-int     sisusb_writeb(struct sisusb_usb_data *sisusb, u32 adr, u8 data);
-int     sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data);
-int     sisusb_writew(struct sisusb_usb_data *sisusb, u32 adr, u16 data);
-int     sisusb_readw(struct sisusb_usb_data *sisusb, u32 adr, u16 *data);
-int     sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,
-                        u32 dest, int length, size_t *bytes_written);
-
-int     sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init);
-
-extern int  SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
-extern int  SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo);
-
-extern void sisusb_init_concode(void);
-extern int  sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last);
-extern void sisusb_console_exit(struct sisusb_usb_data *sisusb);
-
-extern void sisusb_set_cursor(struct sisusb_usb_data *sisusb, unsigned int location);
-
-extern int  sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,
-                u8 *arg, int cmapsz, int ch512, int dorecalc,
-                struct vc_data *c, int fh, int uplock);
-
 static int sisusb_first_vc = 0;
 static int sisusb_last_vc = 0;
 module_param_named(first, sisusb_first_vc, int, 0);
@@ -102,7 +74,7 @@ MODULE_PARM_DESC(last, "Number of last console to take over (1 - MAX_NR_CONSOLES
 
 static struct usb_driver sisusb_driver;
 
-DECLARE_MUTEX(disconnect_sem);
+DEFINE_MUTEX(disconnect_mutex);
 
 static void
 sisusb_free_buffers(struct sisusb_usb_data *sisusb)
@@ -1359,9 +1331,6 @@ sisusb_getreg(struct sisusb_usb_data *sisusb, int port, u8 *data)
 }
 #endif
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data)
 {
@@ -1371,9 +1340,6 @@ sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data)
         return ret;
 }
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data)
 {
@@ -1383,9 +1349,6 @@ sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data)
         return ret;
 }
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx,
                                                         u8 myand, u8 myor)
@@ -1415,18 +1378,12 @@ sisusb_setidxregmask(struct sisusb_usb_data *sisusb, int port, u8 idx,
         return ret;
 }
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port, u8 index, u8 myor)
 {
         return(sisusb_setidxregandor(sisusb, port, index, 0xff, myor));
 }
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand)
 {
@@ -1448,6 +1405,8 @@ sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data)
         return(sisusb_read_memio_byte(sisusb, SISUSB_TYPE_MEM, adr, data));
 }
 
+#if 0
+
 int
 sisusb_writew(struct sisusb_usb_data *sisusb, u32 adr, u16 data)
 {
@@ -1460,6 +1419,8 @@ sisusb_readw(struct sisusb_usb_data *sisusb, u32 adr, u16 *data)
         return(sisusb_read_memio_word(sisusb, SISUSB_TYPE_MEM, adr, data));
 }
 
+#endif  /*  0  */
+
 int
 sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,
                         u32 dest, int length, size_t *bytes_written)
@@ -2552,39 +2513,39 @@ sisusb_open(struct inode *inode, struct file *file)
         struct usb_interface *interface;
         int subminor = iminor(inode);
 
-        down(&disconnect_sem);
+        mutex_lock(&disconnect_mutex);
 
         if (!(interface = usb_find_interface(&sisusb_driver, subminor))) {
                 printk(KERN_ERR "sisusb[%d]: Failed to find interface\n",
                                 subminor);
-                up(&disconnect_sem);
+                mutex_unlock(&disconnect_mutex);
                 return -ENODEV;
         }
 
         if (!(sisusb = usb_get_intfdata(interface))) {
-                up(&disconnect_sem);
+                mutex_unlock(&disconnect_mutex);
                 return -ENODEV;
         }
 
-        down(&sisusb->lock);
+        mutex_lock(&sisusb->lock);
 
         if (!sisusb->present || !sisusb->ready) {
-                up(&sisusb->lock);
-                up(&disconnect_sem);
+                mutex_unlock(&sisusb->lock);
+                mutex_unlock(&disconnect_mutex);
                 return -ENODEV;
         }
 
         if (sisusb->isopen) {
-                up(&sisusb->lock);
-                up(&disconnect_sem);
+                mutex_unlock(&sisusb->lock);
+                mutex_unlock(&disconnect_mutex);
                 return -EBUSY;
         }
 
         if (!sisusb->devinit) {
                 if (sisusb->sisusb_dev->speed == USB_SPEED_HIGH) {
                         if (sisusb_init_gfxdevice(sisusb, 0)) {
-                                up(&sisusb->lock);
-                                up(&disconnect_sem);
+                                mutex_unlock(&sisusb->lock);
+                                mutex_unlock(&disconnect_mutex);
                                 printk(KERN_ERR
                                         "sisusbvga[%d]: Failed to initialize "
                                         "device\n",
@@ -2592,8 +2553,8 @@ sisusb_open(struct inode *inode, struct file *file)
                                 return -EIO;
                         }
                 } else {
-                        up(&sisusb->lock);
-                        up(&disconnect_sem);
+                        mutex_unlock(&sisusb->lock);
+                        mutex_unlock(&disconnect_mutex);
                         printk(KERN_ERR
                                 "sisusbvga[%d]: Device not attached to "
                                 "USB 2.0 hub\n",
@@ -2609,9 +2570,9 @@ sisusb_open(struct inode *inode, struct file *file)
 
         file->private_data = sisusb;
 
-        up(&sisusb->lock);
+        mutex_unlock(&sisusb->lock);
 
-        up(&disconnect_sem);
+        mutex_unlock(&disconnect_mutex);
 
         return 0;
 }
@@ -2642,14 +2603,14 @@ sisusb_release(struct inode *inode, struct file *file)
         struct sisusb_usb_data *sisusb;
         int myminor;
 
-        down(&disconnect_sem);
+        mutex_lock(&disconnect_mutex);
 
         if (!(sisusb = (struct sisusb_usb_data *)file->private_data)) {
-                up(&disconnect_sem);
+                mutex_unlock(&disconnect_mutex);
                 return -ENODEV;
         }
 
-        down(&sisusb->lock);
+        mutex_lock(&sisusb->lock);
 
         if (sisusb->present) {
                 /* Wait for all URBs to finish if device still present */
@@ -2662,12 +2623,12 @@ sisusb_release(struct inode *inode, struct file *file)
         sisusb->isopen = 0;
         file->private_data = NULL;
 
-        up(&sisusb->lock);
+        mutex_unlock(&sisusb->lock);
 
         /* decrement the usage count on our device */
         kref_put(&sisusb->kref, sisusb_delete);
 
-        up(&disconnect_sem);
+        mutex_unlock(&disconnect_mutex);
 
         return 0;
 }
@@ -2685,11 +2646,11 @@ sisusb_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
         if (!(sisusb = (struct sisusb_usb_data *)file->private_data))
                 return -ENODEV;
 
-        down(&sisusb->lock);
+        mutex_lock(&sisusb->lock);
 
         /* Sanity check */
         if (!sisusb->present || !sisusb->ready || !sisusb->sisusb_dev) {
-                up(&sisusb->lock);
+                mutex_unlock(&sisusb->lock);
                 return -ENODEV;
         }
 
@@ -2784,7 +2745,7 @@ sisusb_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
                     (*ppos) <= SISUSB_PCI_PSEUDO_PCIBASE + 0x5c) {
 
                 if (count != 4) {
-                        up(&sisusb->lock);
+                        mutex_unlock(&sisusb->lock);
                         return -EINVAL;
                 }
 
@@ -2808,7 +2769,7 @@ sisusb_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 
         (*ppos) += bytes_read;
 
-        up(&sisusb->lock);
+        mutex_unlock(&sisusb->lock);
 
         return errno ? errno : bytes_read;
 }
@@ -2827,11 +2788,11 @@ sisusb_write(struct file *file, const char __user *buffer, size_t count,
         if (!(sisusb = (struct sisusb_usb_data *)file->private_data))
                 return -ENODEV;
 
-        down(&sisusb->lock);
+        mutex_lock(&sisusb->lock);
 
         /* Sanity check */
         if (!sisusb->present || !sisusb->ready || !sisusb->sisusb_dev) {
-                up(&sisusb->lock);
+                mutex_unlock(&sisusb->lock);
                 return -ENODEV;
         }
 
@@ -2930,7 +2891,7 @@ sisusb_write(struct file *file, const char __user *buffer, size_t count,
                     (*ppos) <= SISUSB_PCI_PSEUDO_PCIBASE + SISUSB_PCI_PCONFSIZE) {
 
                 if (count != 4) {
-                        up(&sisusb->lock);
+                        mutex_unlock(&sisusb->lock);
                         return -EINVAL;
                 }
 
@@ -2956,7 +2917,7 @@ sisusb_write(struct file *file, const char __user *buffer, size_t count,
 
         (*ppos) += bytes_written;
 
-        up(&sisusb->lock);
+        mutex_unlock(&sisusb->lock);
 
         return errno ? errno : bytes_written;
 }
@@ -2970,11 +2931,11 @@ sisusb_lseek(struct file *file, loff_t offset, int orig)
         if (!(sisusb = (struct sisusb_usb_data *)file->private_data))
                 return -ENODEV;
 
-        down(&sisusb->lock);
+        mutex_lock(&sisusb->lock);
 
         /* Sanity check */
         if (!sisusb->present || !sisusb->ready || !sisusb->sisusb_dev) {
-                up(&sisusb->lock);
+                mutex_unlock(&sisusb->lock);
                 return -ENODEV;
         }
 
@@ -2994,7 +2955,7 @@ sisusb_lseek(struct file *file, loff_t offset, int orig)
                         ret = -EINVAL;
         }
 
-        up(&sisusb->lock);
+        mutex_unlock(&sisusb->lock);
         return ret;
 }
 
@@ -3136,7 +3097,7 @@ sisusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         if (!(sisusb = (struct sisusb_usb_data *)file->private_data))
                 return -ENODEV;
 
-        down(&sisusb->lock);
+        mutex_lock(&sisusb->lock);
 
         /* Sanity check */
         if (!sisusb->present || !sisusb->ready || !sisusb->sisusb_dev) {
@@ -3193,7 +3154,7 @@ sisusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         }
 
 err_out:
-        up(&sisusb->lock);
+        mutex_unlock(&sisusb->lock);
         return retval;
 }
 
@@ -3258,7 +3219,7 @@ static int sisusb_probe(struct usb_interface *intf,
         }
         kref_init(&sisusb->kref);
 
-        init_MUTEX(&(sisusb->lock));
+        mutex_init(&(sisusb->lock));
 
         /* Register device */
         if ((retval = usb_register_dev(intf, &usb_sisusb_class))) {
@@ -3429,9 +3390,9 @@ static void sisusb_disconnect(struct usb_interface *intf)
          * protect all other routines from the disconnect
          * case, not the other way round.
          */
-        down(&disconnect_sem);
+        mutex_lock(&disconnect_mutex);
 
-        down(&sisusb->lock);
+        mutex_lock(&sisusb->lock);
 
         /* Wait for all URBs to complete and kill them in case (MUST do) */
         if (!sisusb_wait_all_out_complete(sisusb))
@@ -3462,12 +3423,12 @@ static void sisusb_disconnect(struct usb_interface *intf)
         sisusb->present = 0;
         sisusb->ready = 0;
 
-        up(&sisusb->lock);
+        mutex_unlock(&sisusb->lock);
 
         /* decrement our usage count */
         kref_put(&sisusb->kref, sisusb_delete);
 
-        up(&disconnect_sem);
+        mutex_unlock(&disconnect_mutex);
 
         printk(KERN_INFO "sisusbvga[%d]: Disconnected\n", minor);
 }