Commit 747525de authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] tridentfb.c: make some code static

This patch makes some needlessly global code static.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 31859ae9
...@@ -31,7 +31,7 @@ struct tridentfb_par { ...@@ -31,7 +31,7 @@ struct tridentfb_par {
void __iomem * io_virt; //iospace virtual memory address void __iomem * io_virt; //iospace virtual memory address
}; };
unsigned char eng_oper; //engine operation... static unsigned char eng_oper; //engine operation...
static struct fb_ops tridentfb_ops; static struct fb_ops tridentfb_ops;
static struct tridentfb_par default_par; static struct tridentfb_par default_par;
...@@ -91,7 +91,7 @@ module_param(crt, int, 0); ...@@ -91,7 +91,7 @@ module_param(crt, int, 0);
static int chip3D; static int chip3D;
static int chipcyber; static int chipcyber;
int is3Dchip(int id) static int is3Dchip(int id)
{ {
return ((id == BLADE3D) || (id == CYBERBLADEE4) || return ((id == BLADE3D) || (id == CYBERBLADEE4) ||
(id == CYBERBLADEi7) || (id == CYBERBLADEi7D) || (id == CYBERBLADEi7) || (id == CYBERBLADEi7D) ||
...@@ -104,7 +104,7 @@ int is3Dchip(int id) ...@@ -104,7 +104,7 @@ int is3Dchip(int id)
(id == CYBERBLADEXPAi1)); (id == CYBERBLADEXPAi1));
} }
int iscyber(int id) static int iscyber(int id)
{ {
switch (id) { switch (id) {
case CYBER9388: case CYBER9388:
...@@ -1216,9 +1216,9 @@ static struct pci_driver tridentfb_pci_driver = { ...@@ -1216,9 +1216,9 @@ static struct pci_driver tridentfb_pci_driver = {
.remove = __devexit_p(trident_pci_remove) .remove = __devexit_p(trident_pci_remove)
}; };
int tridentfb_setup(char *options); static int tridentfb_setup(char *options);
int __init tridentfb_init(void) static int __init tridentfb_init(void)
{ {
#ifndef MODULE #ifndef MODULE
char *option = NULL; char *option = NULL;
...@@ -1231,7 +1231,7 @@ int __init tridentfb_init(void) ...@@ -1231,7 +1231,7 @@ int __init tridentfb_init(void)
return pci_module_init(&tridentfb_pci_driver); return pci_module_init(&tridentfb_pci_driver);
} }
void __exit tridentfb_exit(void) static void __exit tridentfb_exit(void)
{ {
pci_unregister_driver(&tridentfb_pci_driver); pci_unregister_driver(&tridentfb_pci_driver);
} }
...@@ -1242,7 +1242,8 @@ void __exit tridentfb_exit(void) ...@@ -1242,7 +1242,8 @@ void __exit tridentfb_exit(void)
* example: * example:
* video=trident:800x600,bpp=16,noaccel * video=trident:800x600,bpp=16,noaccel
*/ */
int tridentfb_setup(char *options) #ifndef MODULE
static int tridentfb_setup(char *options)
{ {
char * opt; char * opt;
if (!options || !*options) if (!options || !*options)
...@@ -1272,6 +1273,7 @@ int tridentfb_setup(char *options) ...@@ -1272,6 +1273,7 @@ int tridentfb_setup(char *options)
} }
return 0; return 0;
} }
#endif
static struct fb_ops tridentfb_ops = { static struct fb_ops tridentfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment