Commit 14aefd1b authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

video/sis/: remove compat code

This patch removes compat code for older kernel versions.
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Cc: <thomas@winischhofer.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0b9cf3aa
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
#ifdef SIS_CP #ifdef SIS_CP
#undef SIS_CP #undef SIS_CP
#endif #endif
#include <linux/version.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/fb.h> #include <linux/fb.h>
......
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
#ifdef SIS_CP #ifdef SIS_CP
#undef SIS_CP #undef SIS_CP
#endif #endif
#include <linux/version.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/fb.h> #include <linux/fb.h>
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "vgatypes.h" #include "vgatypes.h"
#include "vstruct.h" #include "vstruct.h"
#include <linux/version.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/fb.h> #include <linux/fb.h>
......
...@@ -87,7 +87,6 @@ ...@@ -87,7 +87,6 @@
/**********************************************************************/ /**********************************************************************/
#ifdef SIS_LINUX_KERNEL #ifdef SIS_LINUX_KERNEL
#include <linux/version.h>
#ifdef CONFIG_FB_SIS_300 #ifdef CONFIG_FB_SIS_300
#define SIS300 #define SIS300
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#ifndef _SIS_H_ #ifndef _SIS_H_
#define _SIS_H_ #define _SIS_H_
#include <linux/version.h>
#include "osdef.h" #include "osdef.h"
#include <video/sisfb.h> #include <video/sisfb.h>
...@@ -42,16 +40,6 @@ ...@@ -42,16 +40,6 @@
#define SIS_NEW_CONFIG_COMPAT #define SIS_NEW_CONFIG_COMPAT
#endif /* CONFIG_COMPAT */ #endif /* CONFIG_COMPAT */
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
#define SIS_IOTYPE1 void __iomem
#define SIS_IOTYPE2 __iomem
#define SISINITSTATIC static
#else
#define SIS_IOTYPE1 unsigned char
#define SIS_IOTYPE2
#define SISINITSTATIC
#endif
#undef SISFBDEBUG #undef SISFBDEBUG
#ifdef SISFBDEBUG #ifdef SISFBDEBUG
...@@ -505,8 +493,8 @@ struct sis_video_info { ...@@ -505,8 +493,8 @@ struct sis_video_info {
unsigned long UMAsize, LFBsize; unsigned long UMAsize, LFBsize;
SIS_IOTYPE1 *video_vbase; void __iomem *video_vbase;
SIS_IOTYPE1 *mmio_vbase; void __iomem *mmio_vbase;
unsigned char *bios_abase; unsigned char *bios_abase;
...@@ -533,8 +521,8 @@ struct sis_video_info { ...@@ -533,8 +521,8 @@ struct sis_video_info {
int sisfb_nocrt2rate; int sisfb_nocrt2rate;
u32 heapstart; /* offset */ u32 heapstart; /* offset */
SIS_IOTYPE1 *sisfb_heap_start; /* address */ void __iomem *sisfb_heap_start; /* address */
SIS_IOTYPE1 *sisfb_heap_end; /* address */ void __iomem *sisfb_heap_end; /* address */
u32 sisfb_heap_size; u32 sisfb_heap_size;
int havenoheap; int havenoheap;
...@@ -612,7 +600,7 @@ struct sis_video_info { ...@@ -612,7 +600,7 @@ struct sis_video_info {
u8 detectedpdca; u8 detectedpdca;
u8 detectedlcda; u8 detectedlcda;
SIS_IOTYPE1 *hwcursor_vbase; void __iomem *hwcursor_vbase;
int chronteltype; int chronteltype;
int tvxpos, tvypos; int tvxpos, tvypos;
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
* for more information and updates) * for more information and updates)
*/ */
#include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/fb.h> #include <linux/fb.h>
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
* *
*/ */
#include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -41,13 +40,7 @@ ...@@ -41,13 +40,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/mm.h> #include <linux/mm.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
#include <linux/tty.h>
#else
#include <linux/screen_info.h> #include <linux/screen_info.h>
#endif
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/selection.h> #include <linux/selection.h>
...@@ -1167,11 +1160,7 @@ sisfb_set_mode(struct sis_video_info *ivideo, int clrscrn) ...@@ -1167,11 +1160,7 @@ sisfb_set_mode(struct sis_video_info *ivideo, int clrscrn)
unsigned short modeno = ivideo->mode_no; unsigned short modeno = ivideo->mode_no;
/* >=2.6.12's fbcon clears the screen anyway */ /* >=2.6.12's fbcon clears the screen anyway */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
if(!clrscrn) modeno |= 0x80;
#else
modeno |= 0x80; modeno |= 0x80;
#endif
outSISIDXREG(SISSR, IND_SIS_PASSWORD, SIS_PASSWORD); outSISIDXREG(SISSR, IND_SIS_PASSWORD, SIS_PASSWORD);
...@@ -1436,11 +1425,8 @@ sisfb_set_par(struct fb_info *info) ...@@ -1436,11 +1425,8 @@ sisfb_set_par(struct fb_info *info)
if((err = sisfb_do_set_var(&info->var, 1, info))) if((err = sisfb_do_set_var(&info->var, 1, info)))
return err; return err;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
sisfb_get_fix(&info->fix, info->currcon, info);
#else
sisfb_get_fix(&info->fix, -1, info); sisfb_get_fix(&info->fix, -1, info);
#endif
return 0; return 0;
} }
...@@ -1676,14 +1662,8 @@ sisfb_blank(int blank, struct fb_info *info) ...@@ -1676,14 +1662,8 @@ sisfb_blank(int blank, struct fb_info *info)
/* ----------- FBDev related routines for all series ---------- */ /* ----------- FBDev related routines for all series ---------- */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
static int sisfb_ioctl(struct fb_info *info, unsigned int cmd, static int sisfb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg) unsigned long arg)
#else
static int sisfb_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg,
struct fb_info *info)
#endif
{ {
struct sis_video_info *ivideo = (struct sis_video_info *)info->par; struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
struct sis_memreq sismemreq; struct sis_memreq sismemreq;
...@@ -3986,8 +3966,7 @@ sisfb_handle_command(struct sis_video_info *ivideo, struct sisfb_cmd *sisfb_comm ...@@ -3986,8 +3966,7 @@ sisfb_handle_command(struct sis_video_info *ivideo, struct sisfb_cmd *sisfb_comm
} }
#ifndef MODULE #ifndef MODULE
SISINITSTATIC int __init static int __init sisfb_setup(char *options)
sisfb_setup(char *options)
{ {
char *this_opt; char *this_opt;
...@@ -4086,9 +4065,9 @@ sisfb_setup(char *options) ...@@ -4086,9 +4065,9 @@ sisfb_setup(char *options)
#endif #endif
static int __devinit static int __devinit
sisfb_check_rom(SIS_IOTYPE1 *rom_base, struct sis_video_info *ivideo) sisfb_check_rom(void __iomem *rom_base, struct sis_video_info *ivideo)
{ {
SIS_IOTYPE1 *rom; void __iomem *rom;
int romptr; int romptr;
if((readb(rom_base) != 0x55) || (readb(rom_base + 1) != 0xaa)) if((readb(rom_base) != 0x55) || (readb(rom_base + 1) != 0xaa))
...@@ -4117,10 +4096,9 @@ static unsigned char * __devinit ...@@ -4117,10 +4096,9 @@ static unsigned char * __devinit
sisfb_find_rom(struct pci_dev *pdev) sisfb_find_rom(struct pci_dev *pdev)
{ {
struct sis_video_info *ivideo = pci_get_drvdata(pdev); struct sis_video_info *ivideo = pci_get_drvdata(pdev);
SIS_IOTYPE1 *rom_base; void __iomem *rom_base;
unsigned char *myrombase = NULL; unsigned char *myrombase = NULL;
u32 temp; u32 temp;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
size_t romsize; size_t romsize;
/* First, try the official pci ROM functions (except /* First, try the official pci ROM functions (except
...@@ -4151,7 +4129,6 @@ sisfb_find_rom(struct pci_dev *pdev) ...@@ -4151,7 +4129,6 @@ sisfb_find_rom(struct pci_dev *pdev)
} }
if(myrombase) return myrombase; if(myrombase) return myrombase;
#endif
/* Otherwise do it the conventional way. */ /* Otherwise do it the conventional way. */
...@@ -4225,7 +4202,7 @@ sisfb_post_map_vram(struct sis_video_info *ivideo, unsigned int *mapsize, ...@@ -4225,7 +4202,7 @@ sisfb_post_map_vram(struct sis_video_info *ivideo, unsigned int *mapsize,
static int __devinit static int __devinit
sisfb_post_300_buswidth(struct sis_video_info *ivideo) sisfb_post_300_buswidth(struct sis_video_info *ivideo)
{ {
SIS_IOTYPE1 *FBAddress = ivideo->video_vbase; void __iomem *FBAddress = ivideo->video_vbase;
unsigned short temp; unsigned short temp;
unsigned char reg; unsigned char reg;
int i, j; int i, j;
...@@ -4273,7 +4250,7 @@ sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth ...@@ -4273,7 +4250,7 @@ sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth
int PseudoRankCapacity, int PseudoAdrPinCount, int PseudoRankCapacity, int PseudoAdrPinCount,
unsigned int mapsize) unsigned int mapsize)
{ {
SIS_IOTYPE1 *FBAddr = ivideo->video_vbase; void __iomem *FBAddr = ivideo->video_vbase;
unsigned short sr14; unsigned short sr14;
unsigned int k, RankCapacity, PageCapacity, BankNumHigh, BankNumMid; unsigned int k, RankCapacity, PageCapacity, BankNumHigh, BankNumMid;
unsigned int PhysicalAdrOtherPage, PhysicalAdrHigh, PhysicalAdrHalfPage; unsigned int PhysicalAdrOtherPage, PhysicalAdrHigh, PhysicalAdrHalfPage;
...@@ -5829,7 +5806,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -5829,7 +5806,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ivideo->engineok = 0; ivideo->engineok = 0;
ivideo->sisfb_was_boot_device = 0; ivideo->sisfb_was_boot_device = 0;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
if(pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW) { if(pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW) {
if(ivideo->sisvga_enabled) if(ivideo->sisvga_enabled)
ivideo->sisfb_was_boot_device = 1; ivideo->sisfb_was_boot_device = 1;
...@@ -5840,7 +5817,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -5840,7 +5817,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
"as the primary VGA device\n"); "as the primary VGA device\n");
} }
} }
#endif
ivideo->sisfb_parm_mem = sisfb_parm_mem; ivideo->sisfb_parm_mem = sisfb_parm_mem;
ivideo->sisfb_accel = sisfb_accel; ivideo->sisfb_accel = sisfb_accel;
...@@ -6010,7 +5986,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -6010,7 +5986,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ivideo->modeprechange = reg & 0x7f; ivideo->modeprechange = reg & 0x7f;
} else if(ivideo->sisvga_enabled) { } else if(ivideo->sisvga_enabled) {
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
unsigned char SIS_IOTYPE2 *tt = ioremap(0x400, 0x100); unsigned char __iomem *tt = ioremap(0x400, 0x100);
if(tt) { if(tt) {
ivideo->modeprechange = readb(tt + 0x49); ivideo->modeprechange = readb(tt + 0x49);
iounmap(tt); iounmap(tt);
...@@ -6503,7 +6479,7 @@ static struct pci_driver sisfb_driver = { ...@@ -6503,7 +6479,7 @@ static struct pci_driver sisfb_driver = {
.remove = __devexit_p(sisfb_remove) .remove = __devexit_p(sisfb_remove)
}; };
SISINITSTATIC int __init sisfb_init(void) static int __init sisfb_init(void)
{ {
#ifndef MODULE #ifndef MODULE
char *options = NULL; char *options = NULL;
......
...@@ -665,11 +665,11 @@ static struct _customttable { ...@@ -665,11 +665,11 @@ static struct _customttable {
/* Interface used by the world */ /* Interface used by the world */
#ifndef MODULE #ifndef MODULE
SISINITSTATIC int sisfb_setup(char *options); static int sisfb_setup(char *options);
#endif #endif
/* Interface to the low level console driver */ /* Interface to the low level console driver */
SISINITSTATIC int sisfb_init(void); static int sisfb_init(void);
/* fbdev routines */ /* fbdev routines */
static int sisfb_get_fix(struct fb_fix_screeninfo *fix, int con, static int sisfb_get_fix(struct fb_fix_screeninfo *fix, int con,
......
...@@ -53,10 +53,6 @@ ...@@ -53,10 +53,6 @@
#ifndef _VGATYPES_H_ #ifndef _VGATYPES_H_
#define _VGATYPES_H_ #define _VGATYPES_H_
#ifdef SIS_LINUX_KERNEL
#include <linux/version.h>
#endif
#define SISIOMEMTYPE #define SISIOMEMTYPE
#ifdef SIS_LINUX_KERNEL #ifdef SIS_LINUX_KERNEL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment