viafb: simplify lcd size "detection" · tjh.dev/kernel@cc3fd67

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

viafb: simplify lcd size "detection"

viafb: simplify lcd size "detection"

Remove all occurences of get_lcd_size_method as only the values
GET_LCD_SIZE_BY_VGA_BIOS and GET_LCD_SIZE_BY_USER_SETTING were used
which had the identical code so there is no need to make things look
more complicated than they actually are.
Just a bit of of cleanup, really no regressions expected.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>

Florian Tobias Schandinat 15 years ago cc3fd679 ad0676cf

+1 -41

4 changed files

expand all

drivers

video

via

chip.h

hw.c

lcd.c

lcd.h

-1

drivers/video/via/chip.h

··· 160 160 int v_active; 161 161 int bpp; 162 162 int refresh_rate; 163 - int get_lcd_size_method; 164 163 int lcd_panel_id; 165 164 int lcd_panel_hres; 166 165 int lcd_panel_vres;

-9

drivers/video/via/hw.c

··· 1791 1791 viafb_set_iga_path(); 1792 1792 1793 1793 viaparinfo->lvds_setting_info->display_method = viafb_lcd_dsp_method; 1794 - viaparinfo->lvds_setting_info->get_lcd_size_method = 1795 - GET_LCD_SIZE_BY_USER_SETTING; 1796 1794 viaparinfo->lvds_setting_info->lcd_mode = viafb_lcd_mode; 1797 1795 viaparinfo->lvds_setting_info2->display_method = 1798 1796 viaparinfo->lvds_setting_info->display_method; ··· 1944 1946 1945 1947 static void init_lvds_chip_info(void) 1946 1948 { 1947 - if (viafb_lcd_panel_id > LCD_PANEL_ID_MAXIMUM) 1948 - viaparinfo->lvds_setting_info->get_lcd_size_method = 1949 - GET_LCD_SIZE_BY_VGA_BIOS; 1950 - else 1951 - viaparinfo->lvds_setting_info->get_lcd_size_method = 1952 - GET_LCD_SIZE_BY_USER_SETTING; 1953 - 1954 1949 viafb_lvds_trasmitter_identify(); 1955 1950 viafb_init_lcd_size(); 1956 1951 viafb_init_lvds_output_interface(&viaparinfo->chip_info->lvds_chip_info,

+1 -26

drivers/video/via/lcd.c

··· 87 87 void viafb_init_lcd_size(void) 88 88 { 89 89 DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n"); 90 - DEBUG_MSG(KERN_INFO 91 - "viaparinfo->lvds_setting_info->get_lcd_size_method %d\n", 92 - viaparinfo->lvds_setting_info->get_lcd_size_method); 93 90 94 - switch (viaparinfo->lvds_setting_info->get_lcd_size_method) { 95 - case GET_LCD_SIZE_BY_SYSTEM_BIOS: 96 - break; 97 - case GET_LCD_SZIE_BY_HW_STRAPPING: 98 - break; 99 - case GET_LCD_SIZE_BY_VGA_BIOS: 100 - DEBUG_MSG(KERN_INFO "Get LCD Size method by VGA BIOS !!\n"); 101 - fp_id_to_vindex(viafb_lcd_panel_id); 102 - DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n", 103 - viaparinfo->lvds_setting_info->lcd_panel_id); 104 - break; 105 - case GET_LCD_SIZE_BY_USER_SETTING: 106 - DEBUG_MSG(KERN_INFO "Get LCD Size method by user setting !!\n"); 107 - fp_id_to_vindex(viafb_lcd_panel_id); 108 - DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n", 109 - viaparinfo->lvds_setting_info->lcd_panel_id); 110 - break; 111 - default: 112 - DEBUG_MSG(KERN_INFO "viafb_init_lcd_size fail\n"); 113 - viaparinfo->lvds_setting_info->lcd_panel_id = 114 - LCD_PANEL_ID1_800X600; 115 - fp_id_to_vindex(LCD_PANEL_ID1_800X600); 116 - } 91 + fp_id_to_vindex(viafb_lcd_panel_id); 117 92 viaparinfo->lvds_setting_info2->lcd_panel_id = 118 93 viaparinfo->lvds_setting_info->lcd_panel_id; 119 94 viaparinfo->lvds_setting_info2->lcd_panel_hres =

-5

drivers/video/via/lcd.h

··· 28 28 #define VT3271_DEVICE_ID_REG 0x02 29 29 #define VT3271_DEVICE_ID 0x71 30 30 31 - #define GET_LCD_SIZE_BY_SYSTEM_BIOS 0x01 32 - #define GET_LCD_SIZE_BY_VGA_BIOS 0x02 33 - #define GET_LCD_SZIE_BY_HW_STRAPPING 0x03 34 - #define GET_LCD_SIZE_BY_USER_SETTING 0x04 35 - 36 31 /* Definition DVI Panel ID*/ 37 32 /* Resolution: 640x480, Channel: single, Dithering: Enable */ 38 33 #define LCD_PANEL_ID0_640X480 0x00