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

Commit 3d1e412a authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

video/console/stico{n,re}.c: make code static 



This patch makes the following needlessly global code static:
 - sticon.c: sticonsole_init()
 - sticore.c: struct default_sti
 - sticore.c: sti_init_graph()
 - sticore.c: sti_inq_conf()
 - sticore.c: sti_rom_copy()
 - sticore.c: sti_select_fbfont()
 - sticore.c: sti_select_font()
 - sticore.c: sti_get_wmode_rom()
 - sticore.c: sti_read_rom()

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 511e7483

drivers/video/console/sticon.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -370,7 +370,7 @@ static const struct consw sti_con = { 












int __init sticonsole_init(void)

static int __init sticonsole_init(void)

{

{

    /* already initialized ? */

    /* already initialized ? */

    if (sticon_sti)

    if (sticon_sti)

drivers/video/console/sticore.c

+15 −18
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 




#define STI_DRIVERVERSION "Version 0.9a"

#define STI_DRIVERVERSION "Version 0.9a"





struct sti_struct *default_sti __read_mostly;

static struct sti_struct *default_sti __read_mostly;





/* number of STI ROMS found and their ptrs to each struct */

/* number of STI ROMS found and their ptrs to each struct */

static int num_sti_roms __read_mostly;

static int num_sti_roms __read_mostly;
@@ -68,8 +68,7 @@ static const struct sti_init_flags default_init_flags = { 
	.init_cmap_tx = 1,

	.init_cmap_tx = 1,

};

};





int

static int sti_init_graph(struct sti_struct *sti)

sti_init_graph(struct sti_struct *sti) 

{

{

	struct sti_init_inptr_ext inptr_ext = { 0, };

	struct sti_init_inptr_ext inptr_ext = { 0, };

	struct sti_init_inptr inptr = {

	struct sti_init_inptr inptr = {
@@ -100,8 +99,7 @@ static const struct sti_conf_flags default_conf_flags = { 
	.wait	= STI_WAIT,

	.wait	= STI_WAIT,

};

};





void

static void sti_inq_conf(struct sti_struct *sti)

sti_inq_conf(struct sti_struct *sti)

{

{

	struct sti_conf_inptr inptr = { 0, };

	struct sti_conf_inptr inptr = { 0, };

	unsigned long flags;

	unsigned long flags;
@@ -237,8 +235,8 @@ static void sti_flush(unsigned long start, unsigned long end) 
	flush_icache_range(start, end);

	flush_icache_range(start, end);

}

}





void __devinit

static void __devinit sti_rom_copy(unsigned long base, unsigned long count,

sti_rom_copy(unsigned long base, unsigned long count, void *dest)

				   void *dest)

{

{

	unsigned long dest_start = (unsigned long) dest;

	unsigned long dest_start = (unsigned long) dest;
@@ -478,8 +476,8 @@ sti_init_glob_cfg(struct sti_struct *sti, 
}

}





#ifdef CONFIG_FB

#ifdef CONFIG_FB

struct sti_cooked_font * __devinit

static struct sti_cooked_font __devinit

sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)

*sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)

{

{

	const struct font_desc *fbfont;

	const struct font_desc *fbfont;

	unsigned int size, bpc;

	unsigned int size, bpc;
@@ -534,15 +532,15 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) 
	return cooked_font;

	return cooked_font;

}

}

#else

#else

struct sti_cooked_font * __devinit

static struct sti_cooked_font __devinit

sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)

*sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)

{

{

	return NULL;

	return NULL;

}

}

#endif

#endif





struct sti_cooked_font * __devinit

static struct sti_cooked_font __devinit

sti_select_font(struct sti_cooked_rom *rom,

*sti_select_font(struct sti_cooked_rom *rom,

		 int (*search_font_fnc)(struct sti_cooked_rom *, int, int))

		 int (*search_font_fnc)(struct sti_cooked_rom *, int, int))

{

{

	struct sti_cooked_font *font;

	struct sti_cooked_font *font;
@@ -707,8 +705,7 @@ sti_get_bmode_rom (unsigned long address) 
	return raw;

	return raw;

}

}





struct sti_rom * __devinit

static struct sti_rom __devinit *sti_get_wmode_rom(unsigned long address)

sti_get_wmode_rom (unsigned long address)

{

{

	struct sti_rom *raw;

	struct sti_rom *raw;

	unsigned long size;

	unsigned long size;
@@ -723,8 +720,8 @@ sti_get_wmode_rom (unsigned long address) 
	return raw;

	return raw;

}

}





int __devinit

static int __devinit sti_read_rom(int wordmode, struct sti_struct *sti,

sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address)

				  unsigned long address)

{

{

	struct sti_cooked_rom *cooked;

	struct sti_cooked_rom *cooked;

	struct sti_rom *raw = NULL;

	struct sti_rom *raw = NULL;

drivers/video/sticore.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -352,8 +352,6 @@ struct sti_struct *sti_get_rom(unsigned int index); /* 0: default sti */ 




/* functions to call the STI ROM directly */

/* functions to call the STI ROM directly */





int  sti_init_graph(struct sti_struct *sti);

void sti_inq_conf(struct sti_struct *sti);

void sti_putc(struct sti_struct *sti, int c, int y, int x);

void sti_putc(struct sti_struct *sti, int c, int y, int x);

void sti_set(struct sti_struct *sti, int src_y, int src_x,

void sti_set(struct sti_struct *sti, int src_y, int src_x,

	     int height, int width, u8 color);

	     int height, int width, u8 color);