staging: panel: initialize lcd if lcd enabled
PATCH v2 1/1 staging: panel: initialize lcd if lcd enabled
initialiaze lcd parameters only if lcd is enabled.
Signed-off-by Sudip Mukherjee <[email protected]>
---
v2: fix indention of comment
drivers/staging/panel/panel.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-)
drivers/staging/panel/panel.c +22 -19
@@ -2323,25 +2323,6 @@ static int __init panel_init_module(void)break ; } -/* -* Init lcd struct with load-time values to preserve exact current -* functionality (at least for now). -*/ - lcd.height = lcd_height; - lcd.width = lcd_width; - lcd.bwidth = lcd_bwidth; - lcd.hwidth = lcd_hwidth; - lcd.charset = lcd_charset; - lcd.proto = lcd_proto; - lcd.pins.e = lcd_e_pin; - lcd.pins.rs = lcd_rs_pin; - lcd.pins.rw = lcd_rw_pin; - lcd.pins.cl = lcd_cl_pin; - lcd.pins.da = lcd_da_pin; - lcd.pins.bl = lcd_bl_pin; - -/* Leave it for now, just in case */ - lcd.esc_seq.len =-1 ;/* * Overwrite selection with module param values (both keypad and lcd),
@@ -2361,6 +2342,28 @@ static int __init panel_init_module(void) lcd.enabled = (selected_lcd_type >0 ); +if (lcd.enabled) { +/* +* Init lcd struct with load-time values to preserve exact +* current functionality (at least for now). +*/ + lcd.height = lcd_height; + lcd.width = lcd_width; + lcd.bwidth = lcd_bwidth; + lcd.hwidth = lcd_hwidth; + lcd.charset = lcd_charset; + lcd.proto = lcd_proto; + lcd.pins.e = lcd_e_pin; + lcd.pins.rs = lcd_rs_pin; + lcd.pins.rw = lcd_rw_pin; + lcd.pins.cl = lcd_cl_pin; + lcd.pins.da = lcd_da_pin; + lcd.pins.bl = lcd_bl_pin; + +/* Leave it for now, just in case */ + lcd.esc_seq.len =-1 ; + } +switch (selected_keypad_type) {case KEYPAD_TYPE_OLD : keypad_profile = old_keypad_profile;
Signature · 1 line
1.8.1.2