1 files changed, 1 insertions, 28 deletions

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 9244d067cec1..cb7fa0eaf3ae 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -323,7 +323,7 @@ sisusb_bulkin_msg(struct sisusb_usb_data *sisusb, unsigned int pipe, void *data,
                         usb_kill_urb(urb);
                         retval = -ETIMEDOUT;
                 } else {
-                        /* URB completed within timout */
+                        /* URB completed within timeout */
                         retval = urb->status;
                         readbytes = urb->actual_length;
                 }
@@ -3195,20 +3195,6 @@ static int sisusb_probe(struct usb_interface *intf,
 
         sisusb->present = 1;
 
-#ifdef SISUSB_OLD_CONFIG_COMPAT
-        {
-        int ret;
-        /* Our ioctls are all "32/64bit compatible" */
-        ret =  register_ioctl32_conversion(SISUSB_GET_CONFIG_SIZE, NULL);
-        ret |= register_ioctl32_conversion(SISUSB_GET_CONFIG,      NULL);
-        ret |= register_ioctl32_conversion(SISUSB_COMMAND,         NULL);
-        if (ret)
-                dev_err(&sisusb->sisusb_dev->dev, "Error registering ioctl32 translations\n");
-        else
-                sisusb->ioctl32registered = 1;
-        }
-#endif
-
         if (dev->speed == USB_SPEED_HIGH) {
                 int initscreen = 1;
 #ifdef INCL_SISUSB_CON
@@ -3271,19 +3257,6 @@ static void sisusb_disconnect(struct usb_interface *intf)
 
         usb_set_intfdata(intf, NULL);
 
-#ifdef SISUSB_OLD_CONFIG_COMPAT
-        if (sisusb->ioctl32registered) {
-                int ret;
-                sisusb->ioctl32registered = 0;
-                ret =  unregister_ioctl32_conversion(SISUSB_GET_CONFIG_SIZE);
-                ret |= unregister_ioctl32_conversion(SISUSB_GET_CONFIG);
-                ret |= unregister_ioctl32_conversion(SISUSB_COMMAND);
-                if (ret) {
-                        dev_err(&sisusb->sisusb_dev->dev, "Error unregistering ioctl32 translations\n");
-                }
-        }
-#endif
-
         sisusb->present = 0;
         sisusb->ready = 0;