diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2010-03-10 15:21:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 15:52:33 -0800 |
| commit | dba77f8409eb861b28d295211776d953a8255ec7 (patch) | |
| tree | 0214d1b9200572564ab1b856f52f78acaeaa2922 /drivers/video/via | |
| parent | 4bbac05f8c0ab40dcc52ed6dff44e1b0d80fa6e3 (diff) | |
| download | linux-stable-dba77f8409eb861b28d295211776d953a8255ec7.tar.gz linux-stable-dba77f8409eb861b28d295211776d953a8255ec7.tar.bz2 linux-stable-dba77f8409eb861b28d295211776d953a8255ec7.zip | |
viafb: make some variables a bit less global
Move some variables closer to their usage.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/via')
| -rw-r--r-- | drivers/video/via/global.c | 4 | ||||
| -rw-r--r-- | drivers/video/via/global.h | 2 | ||||
| -rw-r--r-- | drivers/video/via/hw.h | 2 | ||||
| -rw-r--r-- | drivers/video/via/viafbdev.c | 9 | ||||
| -rw-r--r-- | drivers/video/via/viafbdev.h | 2 |
5 files changed, 7 insertions, 12 deletions
diff --git a/drivers/video/via/global.c b/drivers/video/via/global.c index 7fbc618526f4..1ee511b73307 100644 --- a/drivers/video/via/global.c +++ b/drivers/video/via/global.c @@ -29,8 +29,6 @@ int viafb_refresh = 60; int viafb_refresh1 = 60; int viafb_lcd_dsp_method = LCD_EXPANDSION; int viafb_lcd_mode = LCD_OPENLDI; -int viafb_bpp = 32; -int viafb_bpp1 = 32; int viafb_CRT_ON = 1; int viafb_DVI_ON; int viafb_LCD_ON ; @@ -41,8 +39,6 @@ int viafb_hotplug_Xres = 640; int viafb_hotplug_Yres = 480; int viafb_hotplug_bpp = 32; int viafb_hotplug_refresh = 60; -unsigned int viafb_second_offset; -int viafb_second_size; int viafb_primary_dev = None_Device; unsigned int viafb_second_xres = 640; unsigned int viafb_second_yres = 480; diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h index 865b050683d1..8d95d5fd1388 100644 --- a/drivers/video/via/global.h +++ b/drivers/video/via/global.h @@ -67,8 +67,6 @@ extern int viafb_refresh; extern int viafb_refresh1; extern int viafb_lcd_dsp_method; extern int viafb_lcd_mode; -extern int viafb_bpp; -extern int viafb_bpp1; extern int viafb_CRT_ON; extern int viafb_hotplug_Xres; diff --git a/drivers/video/via/hw.h b/drivers/video/via/hw.h index dd54d3e56159..691fbd2d8067 100644 --- a/drivers/video/via/hw.h +++ b/drivers/video/via/hw.h @@ -863,8 +863,6 @@ struct pci_device_id_info { }; extern unsigned int viafb_second_virtual_xres; -extern unsigned int viafb_second_offset; -extern int viafb_second_size; extern int viafb_SAMM_ON; extern int viafb_dual_fb; extern int viafb_LCD2_ON; diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 902f8a1ac6b1..bb0f616b7d44 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c @@ -26,13 +26,17 @@ #include "global.h" -static struct fb_var_screeninfo default_var; static char *viafb_name = "Via"; static u32 pseudo_pal[17]; /* video mode */ static char *viafb_mode; static char *viafb_mode1; +static int viafb_bpp = 32; +static int viafb_bpp1 = 32; + +static unsigned int viafb_second_offset; +static int viafb_second_size; static int viafb_accel = 1; @@ -1849,10 +1853,11 @@ static int __devinit via_pci_probe(struct pci_dev *pdev, { u32 default_xres, default_yres; struct VideoModeTable *vmode_entry; + struct fb_var_screeninfo default_var; u32 viafb_par_length; DEBUG_MSG(KERN_INFO "VIAFB PCI Probe!!\n"); - + memset(&default_var, 0, sizeof(default_var)); viafb_par_length = ALIGN(sizeof(struct viafb_par), BITS_PER_LONG/8); /* Allocate fb_info and ***_par here, also including some other needed diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h index ecdaed841177..61b5953cd159 100644 --- a/drivers/video/via/viafbdev.h +++ b/drivers/video/via/viafbdev.h @@ -83,8 +83,6 @@ struct viafb_par { extern unsigned int viafb_second_virtual_yres; extern unsigned int viafb_second_virtual_xres; -extern unsigned int viafb_second_offset; -extern int viafb_second_size; extern int viafb_SAMM_ON; extern int viafb_dual_fb; extern int viafb_LCD2_ON; |