Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82194
b: refs/heads/master
c: ed8a5d4
h: refs/heads/master
v: v3
  • Loading branch information
Fernando Luis Vázquez Cao authored and Greg Kroah-Hartman committed Feb 1, 2008
1 parent 2fa1cc4 commit 40d324e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 57 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 63bfb1f18a50e879c5cb9684ed241052ad38efcb
refs/heads/master: ed8a5d49a0d4b5cf411a71476e6582f153df54e3
8 changes: 0 additions & 8 deletions trunk/drivers/video/sis/sis.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down
48 changes: 0 additions & 48 deletions trunk/drivers/video/sis/sis_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 ?
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 40d324e

Please sign in to comment.