[patch 4/8] sis FB driver: *_ioctl32_conversion functions do not exist in recent kernels

From: Fernando Luis Vazquez Cao <[email protected]>

Remove dead code while at it.

Signed-off-by: Fernando Luis Vazquez Cao <[email protected]>
Cc: Thomas Winischhofer <[email protected]>
Cc: Greg KH <[email protected]>
Cc: "Antonino A. Daplas" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

 drivers/usb/misc/sisusbvga/sisusb.c |   27 --------------------------
 drivers/usb/misc/sisusbvga/sisusb.h |    3 --
 2 files changed, 30 deletions(-)

diff -puN drivers/usb/misc/sisusbvga/sisusb.c~sis-fb-driver-_ioctl32_conversion-functions-do-not-exist-in-recent-kernels drivers/usb/misc/sisusbvga/sisusb.c
--- a/drivers/usb/misc/sisusbvga/sisusb.c~sis-fb-driver-_ioctl32_conversion-functions-do-not-exist-in-recent-kernels
+++ a/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3195,20 +3195,6 @@ static int sisusb_probe(struct usb_inter
 
 	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
 
 	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 -puN drivers/usb/misc/sisusbvga/sisusb.h~sis-fb-driver-_ioctl32_conversion-functions-do-not-exist-in-recent-kernels drivers/usb/misc/sisusbvga/sisusb.h
--- a/drivers/usb/misc/sisusbvga/sisusb.h~sis-fb-driver-_ioctl32_conversion-functions-do-not-exist-in-recent-kernels
+++ a/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;
_

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel