diff options
author | Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp> | 2007-11-05 02:21:11 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 17:34:48 -0500 |
commit | ed8a5d49a0d4b5cf411a71476e6582f153df54e3 (patch) | |
tree | bf6d32fc0500380c597bfd039adcec1dbf675d70 /drivers/video/sis/sis_main.c | |
parent | 63bfb1f18a50e879c5cb9684ed241052ad38efcb (diff) |
USB: sisusb: *_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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/video/sis/sis_main.c')
-rw-r--r-- | drivers/video/sis/sis_main.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 37bd24b8d83b..93ae747440cb 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
@@ -5805,9 +5805,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
5805 | ivideo->pcifunc = PCI_FUNC(pdev->devfn); | 5805 | ivideo->pcifunc = PCI_FUNC(pdev->devfn); |
5806 | ivideo->subsysvendor = pdev->subsystem_vendor; | 5806 | ivideo->subsysvendor = pdev->subsystem_vendor; |
5807 | ivideo->subsysdevice = pdev->subsystem_device; | 5807 | ivideo->subsysdevice = pdev->subsystem_device; |
5808 | #ifdef SIS_OLD_CONFIG_COMPAT | ||
5809 | ivideo->ioctl32registered = 0; | ||
5810 | #endif | ||
5811 | 5808 | ||
5812 | #ifndef MODULE | 5809 | #ifndef MODULE |
5813 | if(sisfb_mode_idx == -1) { | 5810 | if(sisfb_mode_idx == -1) { |
@@ -6420,30 +6417,6 @@ error_3: vfree(ivideo->bios_abase); | |||
6420 | ivideo->next = card_list; | 6417 | ivideo->next = card_list; |
6421 | card_list = ivideo; | 6418 | card_list = ivideo; |
6422 | 6419 | ||
6423 | #ifdef SIS_OLD_CONFIG_COMPAT | ||
6424 | { | ||
6425 | int ret; | ||
6426 | /* Our ioctls are all "32/64bit compatible" */ | ||
6427 | ret = register_ioctl32_conversion(FBIO_ALLOC, NULL); | ||
6428 | ret |= register_ioctl32_conversion(FBIO_FREE, NULL); | ||
6429 | ret |= register_ioctl32_conversion(FBIOGET_VBLANK, NULL); | ||
6430 | ret |= register_ioctl32_conversion(SISFB_GET_INFO_SIZE, NULL); | ||
6431 | ret |= register_ioctl32_conversion(SISFB_GET_INFO, NULL); | ||
6432 | ret |= register_ioctl32_conversion(SISFB_GET_TVPOSOFFSET, NULL); | ||
6433 | ret |= register_ioctl32_conversion(SISFB_SET_TVPOSOFFSET, NULL); | ||
6434 | ret |= register_ioctl32_conversion(SISFB_SET_LOCK, NULL); | ||
6435 | ret |= register_ioctl32_conversion(SISFB_GET_VBRSTATUS, NULL); | ||
6436 | ret |= register_ioctl32_conversion(SISFB_GET_AUTOMAXIMIZE, NULL); | ||
6437 | ret |= register_ioctl32_conversion(SISFB_SET_AUTOMAXIMIZE, NULL); | ||
6438 | ret |= register_ioctl32_conversion(SISFB_COMMAND, NULL); | ||
6439 | if(ret) | ||
6440 | printk(KERN_ERR | ||
6441 | "sisfb: Error registering ioctl32 translations\n"); | ||
6442 | else | ||
6443 | ivideo->ioctl32registered = 1; | ||
6444 | } | ||
6445 | #endif | ||
6446 | |||
6447 | printk(KERN_INFO "sisfb: 2D acceleration is %s, y-panning %s\n", | 6420 | printk(KERN_INFO "sisfb: 2D acceleration is %s, y-panning %s\n", |
6448 | ivideo->sisfb_accel ? "enabled" : "disabled", | 6421 | ivideo->sisfb_accel ? "enabled" : "disabled", |
6449 | ivideo->sisfb_ypan ? | 6422 | ivideo->sisfb_ypan ? |
@@ -6473,27 +6446,6 @@ static void __devexit sisfb_remove(struct pci_dev *pdev) | |||
6473 | int registered = ivideo->registered; | 6446 | int registered = ivideo->registered; |
6474 | int modechanged = ivideo->modechanged; | 6447 | int modechanged = ivideo->modechanged; |
6475 | 6448 | ||
6476 | #ifdef SIS_OLD_CONFIG_COMPAT | ||
6477 | if(ivideo->ioctl32registered) { | ||
6478 | int ret; | ||
6479 | ret = unregister_ioctl32_conversion(FBIO_ALLOC); | ||
6480 | ret |= unregister_ioctl32_conversion(FBIO_FREE); | ||
6481 | ret |= unregister_ioctl32_conversion(FBIOGET_VBLANK); | ||
6482 | ret |= unregister_ioctl32_conversion(SISFB_GET_INFO_SIZE); | ||
6483 | ret |= unregister_ioctl32_conversion(SISFB_GET_INFO); | ||
6484 | ret |= unregister_ioctl32_conversion(SISFB_GET_TVPOSOFFSET); | ||
6485 | ret |= unregister_ioctl32_conversion(SISFB_SET_TVPOSOFFSET); | ||
6486 | ret |= unregister_ioctl32_conversion(SISFB_SET_LOCK); | ||
6487 | ret |= unregister_ioctl32_conversion(SISFB_GET_VBRSTATUS); | ||
6488 | ret |= unregister_ioctl32_conversion(SISFB_GET_AUTOMAXIMIZE); | ||
6489 | ret |= unregister_ioctl32_conversion(SISFB_SET_AUTOMAXIMIZE); | ||
6490 | ret |= unregister_ioctl32_conversion(SISFB_COMMAND); | ||
6491 | if(ret) | ||
6492 | printk(KERN_ERR | ||
6493 | "sisfb: Error unregistering ioctl32 translations\n"); | ||
6494 | } | ||
6495 | #endif | ||
6496 | |||
6497 | /* Unmap */ | 6449 | /* Unmap */ |
6498 | iounmap(ivideo->mmio_vbase); | 6450 | iounmap(ivideo->mmio_vbase); |
6499 | iounmap(ivideo->video_vbase); | 6451 | iounmap(ivideo->video_vbase); |