USB: sis FB driver: *_ioctl32_conversion functions do not exist in recent kernels

Remove dead code while at it.

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: Greg KH <greg@kroah.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 9244d067cec1d9e3232d3379bae6cf46fa998925..8832a72bb1fb35a10ce6919a8cc9d048fe48abb8 100644 (file)
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -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;
 

diff --git a/drivers/usb/misc/sisusbvga/sisusb.h b/drivers/usb/misc/sisusbvga/sisusb.h
index d2d7872cd0229622ba546f3fc3111b20bccc471e..cf0b4a5883f665f27f2f9d34d13e9854d080565f 100644 (file)
--- a/drivers/usb/misc/sisusbvga/sisusb.h
+++ b/drivers/usb/misc/sisusbvga/sisusb.h
@@ -120,9 +120,6 @@ struct sisusb_usb_data {
        int isopen;             /* !=0 if open */
        int present;            /* !=0 if device is present on the bus */
        int ready;              /* !=0 if device is ready for userland */
-#ifdef SISUSB_OLD_CONFIG_COMPAT
-       int ioctl32registered;
-#endif
        int numobufs;           /* number of obufs = number of out urbs */
        char *obuf[NUMOBUFS], *ibuf;    /* transfer buffers */
        int obufsize, ibufsize;