From: Adrian Bunk <bunk@stusta.de>
This patch makes some needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/video/i810/i810_gtf.c | 12 ++++++------
25-akpm/drivers/video/i810/i810_main.c | 12 +++++++-----
2 files changed, 13 insertions(+), 11 deletions(-)
diff -puN drivers/video/i810/i810_gtf.c~drivers-video-i810-make-some-code-static drivers/video/i810/i810_gtf.c
--- 25/drivers/video/i810/i810_gtf.c~drivers-video-i810-make-some-code-static 2005-01-25 21:27:07.960770400 -0800
+++ 25-akpm/drivers/video/i810/i810_gtf.c 2005-01-25 21:27:07.966769488 -0800
@@ -26,7 +26,7 @@ struct wm_info {
u32 wm;
};
-struct wm_info i810_wm_8_100[] = {
+static struct wm_info i810_wm_8_100[] = {
{ 15, 0x0070c000 }, { 19, 0x0070c000 }, { 25, 0x22003000 },
{ 28, 0x22003000 }, { 31, 0x22003000 }, { 36, 0x22007000 },
{ 40, 0x22007000 }, { 45, 0x22007000 }, { 49, 0x22008000 },
@@ -40,7 +40,7 @@ struct wm_info i810_wm_8_100[] = {
{ 218, 0x2220f000 }, { 229, 0x22210000 }, { 234, 0x22210000 },
};
-struct wm_info i810_wm_16_100[] = {
+static struct wm_info i810_wm_16_100[] = {
{ 15, 0x0070c000 }, { 19, 0x0020c000 }, { 25, 0x22006000 },
{ 28, 0x22006000 }, { 31, 0x22007000 }, { 36, 0x22007000 },
{ 40, 0x22007000 }, { 45, 0x22007000 }, { 49, 0x22009000 },
@@ -54,7 +54,7 @@ struct wm_info i810_wm_16_100[] = {
{ 218, 0x22416000 }, { 229, 0x22416000 },
};
-struct wm_info i810_wm_24_100[] = {
+static struct wm_info i810_wm_24_100[] = {
{ 15, 0x0020c000 }, { 19, 0x0040c000 }, { 25, 0x22009000 },
{ 28, 0x22009000 }, { 31, 0x2200a000 }, { 36, 0x2210c000 },
{ 40, 0x2210c000 }, { 45, 0x2210c000 }, { 49, 0x22111000 },
@@ -67,7 +67,7 @@ struct wm_info i810_wm_24_100[] = {
{ 195, 0x44419000 }, { 202, 0x44419000 }, { 204, 0x44419000 },
};
-struct wm_info i810_wm_8_133[] = {
+static struct wm_info i810_wm_8_133[] = {
{ 15, 0x0070c000 }, { 19, 0x0070c000 }, { 25, 0x22003000 },
{ 28, 0x22003000 }, { 31, 0x22003000 }, { 36, 0x22007000 },
{ 40, 0x22007000 }, { 45, 0x22007000 }, { 49, 0x22008000 },
@@ -81,7 +81,7 @@ struct wm_info i810_wm_8_133[] = {
{ 218, 0x2220f000 }, { 229, 0x22210000 }, { 234, 0x22210000 },
};
-struct wm_info i810_wm_16_133[] = {
+static struct wm_info i810_wm_16_133[] = {
{ 15, 0x0020c000 }, { 19, 0x0020c000 }, { 25, 0x22006000 },
{ 28, 0x22006000 }, { 31, 0x22007000 }, { 36, 0x22007000 },
{ 40, 0x22007000 }, { 45, 0x22007000 }, { 49, 0x22009000 },
@@ -95,7 +95,7 @@ struct wm_info i810_wm_16_133[] = {
{ 218, 0x22416000 }, { 229, 0x22416000 },
};
-struct wm_info i810_wm_24_133[] = {
+static struct wm_info i810_wm_24_133[] = {
{ 15, 0x0020c000 }, { 19, 0x00408000 }, { 25, 0x22009000 },
{ 28, 0x22009000 }, { 31, 0x2200a000 }, { 36, 0x2210c000 },
{ 40, 0x2210c000 }, { 45, 0x2210c000 }, { 49, 0x22111000 },
diff -puN drivers/video/i810/i810_main.c~drivers-video-i810-make-some-code-static drivers/video/i810/i810_main.c
--- 25/drivers/video/i810/i810_main.c~drivers-video-i810-make-some-code-static 2005-01-25 21:27:07.962770096 -0800
+++ 25-akpm/drivers/video/i810/i810_main.c 2005-01-25 21:27:07.969769032 -0800
@@ -635,7 +635,7 @@ static void i810_save_vga_state(struct i
* DESCRIPTION:
* Calculates buffer pitch in bytes.
*/
-u32 get_line_length(struct i810fb_par *par, int xres_virtual, int bpp)
+static u32 get_line_length(struct i810fb_par *par, int xres_virtual, int bpp)
{
u32 length;
@@ -724,7 +724,7 @@ static void i810_calc_dclk(u32 freq, u32
* Description:
* Shows or hides the hardware cursor
*/
-void i810_enable_cursor(u8 __iomem *mmio, int mode)
+static void i810_enable_cursor(u8 __iomem *mmio, int mode)
{
u32 temp;
@@ -1805,8 +1805,9 @@ i810_allocate_pci_resource(struct i810fb
return 0;
}
-
-int __init i810fb_setup(char *options)
+
+#ifndef MODULE
+static int __init i810fb_setup(char *options)
{
char *this_opt, *suffix = NULL;
@@ -1851,6 +1852,7 @@ int __init i810fb_setup(char *options)
}
return 0;
}
+#endif
static int __devinit i810fb_init_pci (struct pci_dev *dev,
const struct pci_device_id *entry)
@@ -1977,7 +1979,7 @@ static void __exit i810fb_remove_pci(str
}
#ifndef MODULE
-int __init i810fb_init(void)
+static int __init i810fb_init(void)
{
char *option = NULL;
_