Commit ed8a5d49 authored by Fernando Luis Vázquez Cao's avatar Fernando Luis Vázquez Cao Committed by Greg Kroah-Hartman
Browse files

USB: sisusb: *_ioctl32_conversion functions do not exist in recent kernels 



Remove dead code while at it.

Signed-off-by: default avatarFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 63bfb1f1

drivers/video/sis/sis.h

+0 −8
Original line number Diff line number Diff line
@@ -39,12 +39,7 @@ 
#include <linux/spinlock.h>



#ifdef CONFIG_COMPAT

#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)

#include <linux/ioctl32.h>

#define SIS_OLD_CONFIG_COMPAT

#else

#define SIS_NEW_CONFIG_COMPAT

#endif

#endif	/* CONFIG_COMPAT */



#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
@@ -607,9 +602,6 @@ struct sis_video_info { 
	int		haveXGIROM;

	int		registered;

	int		warncount;

#ifdef SIS_OLD_CONFIG_COMPAT

	int		ioctl32registered;

#endif



	int		sisvga_engine;

	int		hwcursor_size;

drivers/video/sis/sis_main.c

+0 −48
Original line number Diff line number Diff line
@@ -5805,9 +5805,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	ivideo->pcifunc = PCI_FUNC(pdev->devfn);

	ivideo->subsysvendor = pdev->subsystem_vendor;

	ivideo->subsysdevice = pdev->subsystem_device;

#ifdef SIS_OLD_CONFIG_COMPAT

	ivideo->ioctl32registered = 0;

#endif



#ifndef MODULE

	if(sisfb_mode_idx == -1) {
@@ -6420,30 +6417,6 @@ error_3: vfree(ivideo->bios_abase); 
		ivideo->next = card_list;

		card_list = ivideo;



#ifdef SIS_OLD_CONFIG_COMPAT

		{

		int ret;

		/* Our ioctls are all "32/64bit compatible" */

		ret =  register_ioctl32_conversion(FBIO_ALLOC,             NULL);

		ret |= register_ioctl32_conversion(FBIO_FREE,              NULL);

		ret |= register_ioctl32_conversion(FBIOGET_VBLANK,         NULL);

		ret |= register_ioctl32_conversion(SISFB_GET_INFO_SIZE,    NULL);

		ret |= register_ioctl32_conversion(SISFB_GET_INFO,         NULL);

		ret |= register_ioctl32_conversion(SISFB_GET_TVPOSOFFSET,  NULL);

		ret |= register_ioctl32_conversion(SISFB_SET_TVPOSOFFSET,  NULL);

		ret |= register_ioctl32_conversion(SISFB_SET_LOCK,         NULL);

		ret |= register_ioctl32_conversion(SISFB_GET_VBRSTATUS,    NULL);

		ret |= register_ioctl32_conversion(SISFB_GET_AUTOMAXIMIZE, NULL);

		ret |= register_ioctl32_conversion(SISFB_SET_AUTOMAXIMIZE, NULL);

		ret |= register_ioctl32_conversion(SISFB_COMMAND,          NULL);

		if(ret)

			printk(KERN_ERR

				"sisfb: Error registering ioctl32 translations\n");

		else

			ivideo->ioctl32registered = 1;

		}

#endif



		printk(KERN_INFO "sisfb: 2D acceleration is %s, y-panning %s\n",

			ivideo->sisfb_accel ? "enabled" : "disabled",

			ivideo->sisfb_ypan  ?
@@ -6473,27 +6446,6 @@ static void __devexit sisfb_remove(struct pci_dev *pdev) 
	int			registered = ivideo->registered;

	int			modechanged = ivideo->modechanged;



#ifdef SIS_OLD_CONFIG_COMPAT

	if(ivideo->ioctl32registered) {

		int ret;

		ret =  unregister_ioctl32_conversion(FBIO_ALLOC);

		ret |= unregister_ioctl32_conversion(FBIO_FREE);

		ret |= unregister_ioctl32_conversion(FBIOGET_VBLANK);

		ret |= unregister_ioctl32_conversion(SISFB_GET_INFO_SIZE);

		ret |= unregister_ioctl32_conversion(SISFB_GET_INFO);

		ret |= unregister_ioctl32_conversion(SISFB_GET_TVPOSOFFSET);

		ret |= unregister_ioctl32_conversion(SISFB_SET_TVPOSOFFSET);

		ret |= unregister_ioctl32_conversion(SISFB_SET_LOCK);

		ret |= unregister_ioctl32_conversion(SISFB_GET_VBRSTATUS);

		ret |= unregister_ioctl32_conversion(SISFB_GET_AUTOMAXIMIZE);

		ret |= unregister_ioctl32_conversion(SISFB_SET_AUTOMAXIMIZE);

		ret |= unregister_ioctl32_conversion(SISFB_COMMAND);

		if(ret)

			printk(KERN_ERR

			     "sisfb: Error unregistering ioctl32 translations\n");

	}

#endif



	/* Unmap */

	iounmap(ivideo->mmio_vbase);

	iounmap(ivideo->video_vbase);