diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2009-09-22 16:47:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 07:39:52 -0700 |
| commit | b008c64b5dfe37ac14928668da60132e9c8361ff (patch) | |
| tree | aac9d95e0b6efb10a071db5af5326420927bdd86 /drivers/video/via | |
| parent | 13147f291cb18489cbaa550b100dee6f9defd007 (diff) | |
viafb: clean up duoview
Clean the duoview handling up by replacing the varible with the funtion in
the only place where it is used. This is a code cleanup only, no runtime
change expected.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Harald Welte <laforge@gnumonks.org>
Cc: Jonathan Corbet <corbet@lwn.net>
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/viafbdev.c | 18 | ||||
| -rw-r--r-- | drivers/video/via/viafbdev.h | 1 |
2 files changed, 2 insertions, 17 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 50e9300d0de..0cd112a3690 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c @@ -1009,7 +1009,8 @@ static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor) return -ENODEV; /* When duoview and using lcd , use soft cursor */ - if (viafb_LCD_ON || ((struct viafb_par *)(info->par))->duoview) + if (viafb_LCD_ON || (!viafb_SAMM_ON && + viafb_LCD2_ON + viafb_DVI_ON + viafb_CRT_ON == 2)) return -ENODEV; viafb_show_hw_cursor(info, HW_Cursor_OFF); @@ -1379,18 +1380,6 @@ static int get_primary_device(void) return primary_device; } -static u8 is_duoview(void) -{ - if (0 == viafb_SAMM_ON) { - if (viafb_LCD_ON + viafb_LCD2_ON + - viafb_DVI_ON + viafb_CRT_ON == 2) - return true; - return false; - } else { - return false; - } -} - static void apply_second_mode_setting(struct fb_var_screeninfo *sec_var) { @@ -1499,8 +1488,6 @@ static int apply_device_setting(struct viafb_ioctl_setting setting_info, need_set_mode = 1; } - viaparinfo->duoview = is_duoview(); - if (!need_set_mode) { ; } else { @@ -1621,7 +1608,6 @@ static void parse_active_dev(void) viafb_CRT_ON = STATE_ON; viafb_SAMM_ON = STATE_OFF; } - viaparinfo->duoview = is_duoview(); } static void parse_video_dev(void) diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h index cd3dff7cc17..92318770107 100644 --- a/drivers/video/via/viafbdev.h +++ b/drivers/video/via/viafbdev.h @@ -52,7 +52,6 @@ struct viafb_par { u32 VQ_end; /* Virtual Queue End Address */ u32 iga_path; struct proc_dir_entry *proc_entry; /*viafb proc entry */ - u8 duoview; /*Is working in duoview mode? */ /* I2C stuff */ struct via_i2c_stuff i2c_stuff; |