diff options
author | Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> | 2007-11-21 18:13:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 17:34:47 -0500 |
commit | 63bfb1f18a50e879c5cb9684ed241052ad38efcb (patch) | |
tree | eb6afc51722c3e21077b510e8875461b569caad2 /drivers/usb/misc/sisusbvga | |
parent | 60a8fc017103325db4b56e4f175f060a6aaac147 (diff) |
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>
Diffstat (limited to 'drivers/usb/misc/sisusbvga')
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 27 | ||||
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.h | 3 |
2 files changed, 0 insertions, 30 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index 9244d067cec1..8832a72bb1fb 100644 --- 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, | |||
3195 | 3195 | ||
3196 | sisusb->present = 1; | 3196 | sisusb->present = 1; |
3197 | 3197 | ||
3198 | #ifdef SISUSB_OLD_CONFIG_COMPAT | ||
3199 | { | ||
3200 | int ret; | ||
3201 | /* Our ioctls are all "32/64bit compatible" */ | ||
3202 | ret = register_ioctl32_conversion(SISUSB_GET_CONFIG_SIZE, NULL); | ||
3203 | ret |= register_ioctl32_conversion(SISUSB_GET_CONFIG, NULL); | ||
3204 | ret |= register_ioctl32_conversion(SISUSB_COMMAND, NULL); | ||
3205 | if (ret) | ||
3206 | dev_err(&sisusb->sisusb_dev->dev, "Error registering ioctl32 translations\n"); | ||
3207 | else | ||
3208 | sisusb->ioctl32registered = 1; | ||
3209 | } | ||
3210 | #endif | ||
3211 | |||
3212 | if (dev->speed == USB_SPEED_HIGH) { | 3198 | if (dev->speed == USB_SPEED_HIGH) { |
3213 | int initscreen = 1; | 3199 | int initscreen = 1; |
3214 | #ifdef INCL_SISUSB_CON | 3200 | #ifdef INCL_SISUSB_CON |
@@ -3271,19 +3257,6 @@ static void sisusb_disconnect(struct usb_interface *intf) | |||
3271 | 3257 | ||
3272 | usb_set_intfdata(intf, NULL); | 3258 | usb_set_intfdata(intf, NULL); |
3273 | 3259 | ||
3274 | #ifdef SISUSB_OLD_CONFIG_COMPAT | ||
3275 | if (sisusb->ioctl32registered) { | ||
3276 | int ret; | ||
3277 | sisusb->ioctl32registered = 0; | ||
3278 | ret = unregister_ioctl32_conversion(SISUSB_GET_CONFIG_SIZE); | ||
3279 | ret |= unregister_ioctl32_conversion(SISUSB_GET_CONFIG); | ||
3280 | ret |= unregister_ioctl32_conversion(SISUSB_COMMAND); | ||
3281 | if (ret) { | ||
3282 | dev_err(&sisusb->sisusb_dev->dev, "Error unregistering ioctl32 translations\n"); | ||
3283 | } | ||
3284 | } | ||
3285 | #endif | ||
3286 | |||
3287 | sisusb->present = 0; | 3260 | sisusb->present = 0; |
3288 | sisusb->ready = 0; | 3261 | sisusb->ready = 0; |
3289 | 3262 | ||
diff --git a/drivers/usb/misc/sisusbvga/sisusb.h b/drivers/usb/misc/sisusbvga/sisusb.h index d2d7872cd022..cf0b4a5883f6 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.h +++ b/drivers/usb/misc/sisusbvga/sisusb.h | |||
@@ -120,9 +120,6 @@ struct sisusb_usb_data { | |||
120 | int isopen; /* !=0 if open */ | 120 | int isopen; /* !=0 if open */ |
121 | int present; /* !=0 if device is present on the bus */ | 121 | int present; /* !=0 if device is present on the bus */ |
122 | int ready; /* !=0 if device is ready for userland */ | 122 | int ready; /* !=0 if device is ready for userland */ |
123 | #ifdef SISUSB_OLD_CONFIG_COMPAT | ||
124 | int ioctl32registered; | ||
125 | #endif | ||
126 | int numobufs; /* number of obufs = number of out urbs */ | 123 | int numobufs; /* number of obufs = number of out urbs */ |
127 | char *obuf[NUMOBUFS], *ibuf; /* transfer buffers */ | 124 | char *obuf[NUMOBUFS], *ibuf; /* transfer buffers */ |
128 | int obufsize, ibufsize; | 125 | int obufsize, ibufsize; |