diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-03-26 23:36:00 -0400 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-03-26 23:36:00 -0400 |
commit | cd00b1154d3c7d711e83c3c17b831aafe6377532 (patch) | |
tree | a889195111765a9db3677dca35dfebc898607441 /drivers/video/via | |
parent | 7f980a06e4a9e3bb26db91da8f0e980b0786023a (diff) |
viafb: replace custom return values
This patch replaces OK/FAIL by true/false which is simpler and saner.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/via')
-rw-r--r-- | drivers/video/via/dvi.c | 22 | ||||
-rw-r--r-- | drivers/video/via/dvi.h | 2 | ||||
-rw-r--r-- | drivers/video/via/lcd.c | 16 | ||||
-rw-r--r-- | drivers/video/via/lcd.h | 2 | ||||
-rw-r--r-- | drivers/video/via/share.h | 8 |
5 files changed, 17 insertions, 33 deletions
diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c index 3dbcd7743f14..b1f364745ca0 100644 --- a/drivers/video/via/dvi.c +++ b/drivers/video/via/dvi.c | |||
@@ -30,12 +30,9 @@ static void __devinit dvi_get_panel_size_from_DDCv1( | |||
30 | struct tmds_setting_information *tmds_setting); | 30 | struct tmds_setting_information *tmds_setting); |
31 | static int viafb_dvi_query_EDID(void); | 31 | static int viafb_dvi_query_EDID(void); |
32 | 32 | ||
33 | static int check_tmds_chip(int device_id_subaddr, int device_id) | 33 | static inline bool check_tmds_chip(int device_id_subaddr, int device_id) |
34 | { | 34 | { |
35 | if (tmds_register_read(device_id_subaddr) == device_id) | 35 | return tmds_register_read(device_id_subaddr) == device_id; |
36 | return OK; | ||
37 | else | ||
38 | return FAIL; | ||
39 | } | 36 | } |
40 | 37 | ||
41 | void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip, | 38 | void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip, |
@@ -50,7 +47,7 @@ void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip, | |||
50 | return; | 47 | return; |
51 | } | 48 | } |
52 | 49 | ||
53 | int __devinit viafb_tmds_trasmitter_identify(void) | 50 | bool __devinit viafb_tmds_trasmitter_identify(void) |
54 | { | 51 | { |
55 | unsigned char sr2a = 0, sr1e = 0, sr3e = 0; | 52 | unsigned char sr2a = 0, sr1e = 0, sr3e = 0; |
56 | 53 | ||
@@ -89,7 +86,7 @@ int __devinit viafb_tmds_trasmitter_identify(void) | |||
89 | viaparinfo->chip_info-> | 86 | viaparinfo->chip_info-> |
90 | tmds_chip_info.tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR; | 87 | tmds_chip_info.tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR; |
91 | viaparinfo->chip_info->tmds_chip_info.i2c_port = VIA_PORT_31; | 88 | viaparinfo->chip_info->tmds_chip_info.i2c_port = VIA_PORT_31; |
92 | if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID) != FAIL) { | 89 | if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID)) { |
93 | /* | 90 | /* |
94 | * Currently only support 12bits,dual edge,add 24bits mode later | 91 | * Currently only support 12bits,dual edge,add 24bits mode later |
95 | */ | 92 | */ |
@@ -100,11 +97,10 @@ int __devinit viafb_tmds_trasmitter_identify(void) | |||
100 | viaparinfo->chip_info->tmds_chip_info.tmds_chip_name); | 97 | viaparinfo->chip_info->tmds_chip_info.tmds_chip_name); |
101 | DEBUG_MSG(KERN_INFO "\n %2d", | 98 | DEBUG_MSG(KERN_INFO "\n %2d", |
102 | viaparinfo->chip_info->tmds_chip_info.i2c_port); | 99 | viaparinfo->chip_info->tmds_chip_info.i2c_port); |
103 | return OK; | 100 | return true; |
104 | } else { | 101 | } else { |
105 | viaparinfo->chip_info->tmds_chip_info.i2c_port = VIA_PORT_2C; | 102 | viaparinfo->chip_info->tmds_chip_info.i2c_port = VIA_PORT_2C; |
106 | if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID) | 103 | if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID)) { |
107 | != FAIL) { | ||
108 | tmds_register_write(0x08, 0x3b); | 104 | tmds_register_write(0x08, 0x3b); |
109 | DEBUG_MSG(KERN_INFO "\n VT1632 TMDS ! \n"); | 105 | DEBUG_MSG(KERN_INFO "\n VT1632 TMDS ! \n"); |
110 | DEBUG_MSG(KERN_INFO "\n %2d", | 106 | DEBUG_MSG(KERN_INFO "\n %2d", |
@@ -113,7 +109,7 @@ int __devinit viafb_tmds_trasmitter_identify(void) | |||
113 | DEBUG_MSG(KERN_INFO "\n %2d", | 109 | DEBUG_MSG(KERN_INFO "\n %2d", |
114 | viaparinfo->chip_info-> | 110 | viaparinfo->chip_info-> |
115 | tmds_chip_info.i2c_port); | 111 | tmds_chip_info.i2c_port); |
116 | return OK; | 112 | return true; |
117 | } | 113 | } |
118 | } | 114 | } |
119 | 115 | ||
@@ -123,7 +119,7 @@ int __devinit viafb_tmds_trasmitter_identify(void) | |||
123 | ((viafb_display_hardware_layout == HW_LAYOUT_DVI_ONLY) || | 119 | ((viafb_display_hardware_layout == HW_LAYOUT_DVI_ONLY) || |
124 | (viafb_display_hardware_layout == HW_LAYOUT_LCD_DVI))) { | 120 | (viafb_display_hardware_layout == HW_LAYOUT_LCD_DVI))) { |
125 | DEBUG_MSG(KERN_INFO "\n Integrated TMDS ! \n"); | 121 | DEBUG_MSG(KERN_INFO "\n Integrated TMDS ! \n"); |
126 | return OK; | 122 | return true; |
127 | } | 123 | } |
128 | 124 | ||
129 | switch (viaparinfo->chip_info->gfx_chip_name) { | 125 | switch (viaparinfo->chip_info->gfx_chip_name) { |
@@ -147,7 +143,7 @@ int __devinit viafb_tmds_trasmitter_identify(void) | |||
147 | tmds_chip_info.tmds_chip_name = NON_TMDS_TRANSMITTER; | 143 | tmds_chip_info.tmds_chip_name = NON_TMDS_TRANSMITTER; |
148 | viaparinfo->chip_info->tmds_chip_info. | 144 | viaparinfo->chip_info->tmds_chip_info. |
149 | tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR; | 145 | tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR; |
150 | return FAIL; | 146 | return false; |
151 | } | 147 | } |
152 | 148 | ||
153 | static void tmds_register_write(int index, u8 data) | 149 | static void tmds_register_write(int index, u8 data) |
diff --git a/drivers/video/via/dvi.h b/drivers/video/via/dvi.h index 2c525c0c1adb..f473dd010977 100644 --- a/drivers/video/via/dvi.h +++ b/drivers/video/via/dvi.h | |||
@@ -56,7 +56,7 @@ | |||
56 | int viafb_dvi_sense(void); | 56 | int viafb_dvi_sense(void); |
57 | void viafb_dvi_disable(void); | 57 | void viafb_dvi_disable(void); |
58 | void viafb_dvi_enable(void); | 58 | void viafb_dvi_enable(void); |
59 | int __devinit viafb_tmds_trasmitter_identify(void); | 59 | bool __devinit viafb_tmds_trasmitter_identify(void); |
60 | void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip, | 60 | void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip, |
61 | struct tmds_setting_information *tmds_setting); | 61 | struct tmds_setting_information *tmds_setting); |
62 | void viafb_dvi_set_mode(struct VideoModeTable *videoMode, int mode_bpp, | 62 | void viafb_dvi_set_mode(struct VideoModeTable *videoMode, int mode_bpp, |
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c index 64bc7e763103..6984046c6eed 100644 --- a/drivers/video/via/lcd.c +++ b/drivers/video/via/lcd.c | |||
@@ -48,7 +48,6 @@ static struct _lcd_scaling_factor lcd_scaling_factor_CLE = { | |||
48 | {LCD_VER_SCALING_FACTOR_REG_NUM_CLE, {{CR78, 0, 7}, {CR79, 6, 7} } } | 48 | {LCD_VER_SCALING_FACTOR_REG_NUM_CLE, {{CR78, 0, 7}, {CR79, 6, 7} } } |
49 | }; | 49 | }; |
50 | 50 | ||
51 | static int check_lvds_chip(int device_id_subaddr, int device_id); | ||
52 | static bool lvds_identify_integratedlvds(void); | 51 | static bool lvds_identify_integratedlvds(void); |
53 | static void __devinit fp_id_to_vindex(int panel_id); | 52 | static void __devinit fp_id_to_vindex(int panel_id); |
54 | static int lvds_register_read(int index); | 53 | static int lvds_register_read(int index); |
@@ -84,12 +83,9 @@ static struct display_timing lcd_centering_timging(struct display_timing | |||
84 | mode_crt_reg, | 83 | mode_crt_reg, |
85 | struct display_timing panel_crt_reg); | 84 | struct display_timing panel_crt_reg); |
86 | 85 | ||
87 | static int check_lvds_chip(int device_id_subaddr, int device_id) | 86 | static inline bool check_lvds_chip(int device_id_subaddr, int device_id) |
88 | { | 87 | { |
89 | if (lvds_register_read(device_id_subaddr) == device_id) | 88 | return lvds_register_read(device_id_subaddr) == device_id; |
90 | return OK; | ||
91 | else | ||
92 | return FAIL; | ||
93 | } | 89 | } |
94 | 90 | ||
95 | void __devinit viafb_init_lcd_size(void) | 91 | void __devinit viafb_init_lcd_size(void) |
@@ -150,7 +146,7 @@ static bool lvds_identify_integratedlvds(void) | |||
150 | return true; | 146 | return true; |
151 | } | 147 | } |
152 | 148 | ||
153 | int __devinit viafb_lvds_trasmitter_identify(void) | 149 | bool __devinit viafb_lvds_trasmitter_identify(void) |
154 | { | 150 | { |
155 | if (viafb_lvds_identify_vt1636(VIA_PORT_31)) { | 151 | if (viafb_lvds_identify_vt1636(VIA_PORT_31)) { |
156 | viaparinfo->chip_info->lvds_chip_info.i2c_port = VIA_PORT_31; | 152 | viaparinfo->chip_info->lvds_chip_info.i2c_port = VIA_PORT_31; |
@@ -175,20 +171,20 @@ int __devinit viafb_lvds_trasmitter_identify(void) | |||
175 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = | 171 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = |
176 | VT1631_LVDS_I2C_ADDR; | 172 | VT1631_LVDS_I2C_ADDR; |
177 | 173 | ||
178 | if (check_lvds_chip(VT1631_DEVICE_ID_REG, VT1631_DEVICE_ID) != FAIL) { | 174 | if (check_lvds_chip(VT1631_DEVICE_ID_REG, VT1631_DEVICE_ID)) { |
179 | DEBUG_MSG(KERN_INFO "\n VT1631 LVDS ! \n"); | 175 | DEBUG_MSG(KERN_INFO "\n VT1631 LVDS ! \n"); |
180 | DEBUG_MSG(KERN_INFO "\n %2d", | 176 | DEBUG_MSG(KERN_INFO "\n %2d", |
181 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_name); | 177 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_name); |
182 | DEBUG_MSG(KERN_INFO "\n %2d", | 178 | DEBUG_MSG(KERN_INFO "\n %2d", |
183 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_name); | 179 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_name); |
184 | return OK; | 180 | return true; |
185 | } | 181 | } |
186 | 182 | ||
187 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_name = | 183 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_name = |
188 | NON_LVDS_TRANSMITTER; | 184 | NON_LVDS_TRANSMITTER; |
189 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = | 185 | viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr = |
190 | VT1631_LVDS_I2C_ADDR; | 186 | VT1631_LVDS_I2C_ADDR; |
191 | return FAIL; | 187 | return false; |
192 | } | 188 | } |
193 | 189 | ||
194 | static void __devinit fp_id_to_vindex(int panel_id) | 190 | static void __devinit fp_id_to_vindex(int panel_id) |
diff --git a/drivers/video/via/lcd.h b/drivers/video/via/lcd.h index c7909fe29550..75f60a655b0e 100644 --- a/drivers/video/via/lcd.h +++ b/drivers/video/via/lcd.h | |||
@@ -79,7 +79,7 @@ void __devinit viafb_init_lvds_output_interface(struct lvds_chip_information | |||
79 | void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, | 79 | void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, |
80 | struct lvds_setting_information *plvds_setting_info, | 80 | struct lvds_setting_information *plvds_setting_info, |
81 | struct lvds_chip_information *plvds_chip_info); | 81 | struct lvds_chip_information *plvds_chip_info); |
82 | int __devinit viafb_lvds_trasmitter_identify(void); | 82 | bool __devinit viafb_lvds_trasmitter_identify(void); |
83 | void viafb_init_lvds_output_interface(struct lvds_chip_information | 83 | void viafb_init_lvds_output_interface(struct lvds_chip_information |
84 | *plvds_chip_info, | 84 | *plvds_chip_info, |
85 | struct lvds_setting_information | 85 | struct lvds_setting_information |
diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h index 4b7831f0d012..beb59bcdf49f 100644 --- a/drivers/video/via/share.h +++ b/drivers/video/via/share.h | |||
@@ -22,14 +22,6 @@ | |||
22 | #ifndef __SHARE_H__ | 22 | #ifndef __SHARE_H__ |
23 | #define __SHARE_H__ | 23 | #define __SHARE_H__ |
24 | 24 | ||
25 | /* Define Return Value */ | ||
26 | #define FAIL -1 | ||
27 | #define OK 1 | ||
28 | |||
29 | #ifndef NULL | ||
30 | #define NULL 0 | ||
31 | #endif | ||
32 | |||
33 | /* Define Bit Field */ | 25 | /* Define Bit Field */ |
34 | #define BIT0 0x01 | 26 | #define BIT0 0x01 |
35 | #define BIT1 0x02 | 27 | #define BIT1 0x02 |