Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4ab2f7a authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files

viafb: propagate __init and __devinit 



There are a lot of init functions which are not marked as such.
Fix this.

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

drivers/video/via/dvi.c

+14 −10
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ 
static void tmds_register_write(int index, u8 data);

static int tmds_register_read(int index);

static int tmds_register_read_bytes(int index, u8 *buff, int buff_len);

static void dvi_get_panel_size_from_DDCv1(struct tmds_chip_information

	*tmds_chip, struct tmds_setting_information *tmds_setting);

static void dvi_get_panel_size_from_DDCv2(struct tmds_chip_information

	*tmds_chip, struct tmds_setting_information *tmds_setting);

static void __devinit dvi_get_panel_size_from_DDCv1(

	struct tmds_chip_information *tmds_chip,

	struct tmds_setting_information *tmds_setting);

static void __devinit dvi_get_panel_size_from_DDCv2(

	struct tmds_chip_information *tmds_chip,

	struct tmds_setting_information *tmds_setting);

static int viafb_dvi_query_EDID(void);



static int check_tmds_chip(int device_id_subaddr, int device_id)
@@ -39,7 +41,7 @@ static int check_tmds_chip(int device_id_subaddr, int device_id) 
		return FAIL;

}



void viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,

void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,

	struct tmds_setting_information *tmds_setting)

{

	DEBUG_MSG(KERN_INFO "viafb_init_dvi_size()\n");
@@ -60,7 +62,7 @@ void viafb_init_dvi_size(struct tmds_chip_information *tmds_chip, 
	return;

}



int viafb_tmds_trasmitter_identify(void)

int __devinit viafb_tmds_trasmitter_identify(void)

{

	unsigned char sr2a = 0, sr1e = 0, sr3e = 0;
@@ -311,8 +313,9 @@ static int viafb_dvi_query_EDID(void) 
}



/* Get Panel Size Using EDID1 Table */

static void dvi_get_panel_size_from_DDCv1(struct tmds_chip_information

	*tmds_chip, struct tmds_setting_information *tmds_setting)

static void __devinit dvi_get_panel_size_from_DDCv1(

	struct tmds_chip_information *tmds_chip,

	struct tmds_setting_information *tmds_setting)

{

	int i, max_h = 0, tmp, restore;

	unsigned char rData;
@@ -416,8 +419,9 @@ static void dvi_get_panel_size_from_DDCv1(struct tmds_chip_information 
}



/* Get Panel Size Using EDID2 Table */

static void dvi_get_panel_size_from_DDCv2(struct tmds_chip_information

	*tmds_chip, struct tmds_setting_information *tmds_setting)

static void __devinit dvi_get_panel_size_from_DDCv2(

	struct tmds_chip_information *tmds_chip,

	struct tmds_setting_information *tmds_setting)

{

	int restore;

	unsigned char R_Buffer[2];

drivers/video/via/dvi.h

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ 
int viafb_dvi_sense(void);

void viafb_dvi_disable(void);

void viafb_dvi_enable(void);

int viafb_tmds_trasmitter_identify(void);

void viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,

int __devinit viafb_tmds_trasmitter_identify(void);

void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,

	struct tmds_setting_information *tmds_setting);

void viafb_dvi_set_mode(struct VideoModeTable *videoMode, int mode_bpp,

	int set_iga);

drivers/video/via/hw.c

+8 −8
Original line number Diff line number Diff line
@@ -724,9 +724,9 @@ static void dvi_patch_skew_dvp_low(void); 
static void set_dvi_output_path(int set_iga, int output_interface);

static void set_lcd_output_path(int set_iga, int output_interface);

static void load_fix_bit_crtc_reg(void);

static void init_gfx_chip_info(int chip_type);

static void init_tmds_chip_info(void);

static void init_lvds_chip_info(void);

static void __devinit init_gfx_chip_info(int chip_type);

static void __devinit init_tmds_chip_info(void);

static void __devinit init_lvds_chip_info(void);

static void device_screen_off(void);

static void device_screen_on(void);

static void set_display_channel(void);
@@ -1980,7 +1980,7 @@ void viafb_fill_crtc_timing(struct crt_mode_table *crt_table, 


}



void viafb_init_chip_info(int chip_type)

void __devinit viafb_init_chip_info(int chip_type)

{

	init_gfx_chip_info(chip_type);

	init_tmds_chip_info();
@@ -2047,7 +2047,7 @@ void viafb_update_device_setting(int hres, int vres, 
	}

}



static void init_gfx_chip_info(int chip_type)

static void __devinit init_gfx_chip_info(int chip_type)

{

	u8 tmp;
@@ -2099,7 +2099,7 @@ static void init_gfx_chip_info(int chip_type) 
	}

}



static void init_tmds_chip_info(void)

static void __devinit init_tmds_chip_info(void)

{

	viafb_tmds_trasmitter_identify();
@@ -2144,7 +2144,7 @@ static void init_tmds_chip_info(void) 
		&viaparinfo->shared->tmds_setting_info);

}



static void init_lvds_chip_info(void)

static void __devinit init_lvds_chip_info(void)

{

	viafb_lvds_trasmitter_identify();

	viafb_init_lcd_size();
@@ -2178,7 +2178,7 @@ static void init_lvds_chip_info(void) 
		  viaparinfo->chip_info->lvds_chip_info.output_interface);

}



void viafb_init_dac(int set_iga)

void __devinit viafb_init_dac(int set_iga)

{

	int i;

	u8 tmp;

drivers/video/via/hw.h

+2 −2
Original line number Diff line number Diff line
@@ -908,8 +908,8 @@ int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp, 
	struct VideoModeTable *vmode_tbl1, int video_bpp1);

void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,

	struct VideoModeTable *vmode_tbl);

void viafb_init_chip_info(int chip_type);

void viafb_init_dac(int set_iga);

void __devinit viafb_init_chip_info(int chip_type);

void __devinit viafb_init_dac(int set_iga);

int viafb_get_pixclock(int hres, int vres, int vmode_refresh);

int viafb_get_refresh(int hres, int vres, u32 float_refresh);

void viafb_update_device_setting(int hres, int vres, int bpp,

drivers/video/via/lcd.c

+5 −5
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static struct _lcd_scaling_factor lcd_scaling_factor_CLE = { 


static int check_lvds_chip(int device_id_subaddr, int device_id);

static bool lvds_identify_integratedlvds(void);

static void fp_id_to_vindex(int panel_id);

static void __devinit fp_id_to_vindex(int panel_id);

static int lvds_register_read(int index);

static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,

		      int panel_vres);
@@ -90,7 +90,7 @@ static int check_lvds_chip(int device_id_subaddr, int device_id) 
		return FAIL;

}



void viafb_init_lcd_size(void)

void __devinit viafb_init_lcd_size(void)

{

	DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n");
@@ -150,7 +150,7 @@ static bool lvds_identify_integratedlvds(void) 
	return true;

}



int viafb_lvds_trasmitter_identify(void)

int __devinit viafb_lvds_trasmitter_identify(void)

{

	if (viafb_lvds_identify_vt1636(VIA_PORT_31)) {

		viaparinfo->chip_info->lvds_chip_info.i2c_port = VIA_PORT_31;
@@ -191,7 +191,7 @@ int viafb_lvds_trasmitter_identify(void) 
	return FAIL;

}



static void fp_id_to_vindex(int panel_id)

static void __devinit fp_id_to_vindex(int panel_id)

{

	DEBUG_MSG(KERN_INFO "fp_get_panel_id()\n");
@@ -996,7 +996,7 @@ static void check_diport_of_integrated_lvds( 
		  plvds_chip_info->output_interface);

}



void viafb_init_lvds_output_interface(struct lvds_chip_information

void __devinit viafb_init_lvds_output_interface(struct lvds_chip_information

				*plvds_chip_info,

				struct lvds_setting_information

				*plvds_setting_info)