Merge branch 'for-neil' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/md...

[linux-2.6] / drivers / usb / misc / sisusbvga / sisusb.c

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 4d6b89336e6332aef22483a8cf26b6143d9d3863..33182f4c2267ad69ddab0106e76cf39e2bff8436 100644 (file)
--- 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;
                }
@@ -2440,10 +2440,8 @@ sisusb_open(struct inode *inode, struct file *file)
        struct usb_interface *interface;
        int subminor = iminor(inode);
 
-       if (!(interface = usb_find_interface(&sisusb_driver, subminor))) {
-               dev_err(&sisusb->sisusb_dev->dev, "Failed to find interface\n");
+       if (!(interface = usb_find_interface(&sisusb_driver, subminor)))
                return -ENODEV;
-       }
 
        if (!(sisusb = usb_get_intfdata(interface)))
                return -ENODEV;
@@ -3197,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
@@ -3273,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;
 
@@ -3293,8 +3264,6 @@ static void sisusb_disconnect(struct usb_interface *intf)
 
        /* decrement our usage count */
        kref_put(&sisusb->kref, sisusb_delete);
-
-       dev_info(&sisusb->sisusb_dev->dev, "Disconnected\n");
 }
 
 static struct usb_device_id sisusb_table [] = {
@@ -3318,22 +3287,12 @@ static struct usb_driver sisusb_driver = {
 
 static int __init usb_sisusb_init(void)
 {
-       int retval;
-       struct sisusb_usb_data *sisusb;
 
 #ifdef INCL_SISUSB_CON
        sisusb_init_concode();
 #endif
 
-       if (!(retval = usb_register(&sisusb_driver))) {
-
-               dev_info(&sisusb->sisusb_dev->dev, "Driver version %d.%d.%d\n", SISUSB_VERSION,
-                               SISUSB_REVISION, SISUSB_PATCHLEVEL);
-               dev_info(&sisusb->sisusb_dev->dev, "sisusb: Copyright (C) 2005 Thomas Winischhofer\n");
-
-       }
-
-       return retval;
+       return usb_register(&sisusb_driver);
 }
 
 static void __exit usb_sisusb_exit(void)