* [2.6 patch] tridentfb.c: make some code static
@ 2005-02-06 23:33 Adrian Bunk
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Bunk @ 2005-02-06 23:33 UTC (permalink / raw)
To: Andrew Morton
Cc: Jani Monoses, Antonino Daplas, linux-kernel, linux-fbdev-devel
This patch makes some needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/video/tridentfb.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
This patch was already sent on:
- 21 Nov 2004
--- linux-2.6.10-rc2-mm2-full/drivers/video/tridentfb.c.old 2004-11-21 15:01:33.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/tridentfb.c 2004-11-21 15:03:19.000000000 +0100
@@ -31,7 +31,7 @@
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 tridentfb_par default_par;
@@ -91,7 +91,7 @@
static int chip3D;
static int chipcyber;
-int is3Dchip(int id)
+static int is3Dchip(int id)
{
return ((id == BLADE3D) || (id == CYBERBLADEE4) ||
(id == CYBERBLADEi7) || (id == CYBERBLADEi7D) ||
@@ -104,7 +104,7 @@
(id == CYBERBLADEXPAi1));
}
-int iscyber(int id)
+static int iscyber(int id)
{
switch (id) {
case CYBER9388:
@@ -1223,9 +1223,9 @@
.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
char *option = NULL;
@@ -1238,7 +1238,7 @@
return pci_module_init(&tridentfb_pci_driver);
}
-void __exit tridentfb_exit(void)
+static void __exit tridentfb_exit(void)
{
pci_unregister_driver(&tridentfb_pci_driver);
}
@@ -1249,7 +1249,8 @@
* example:
* video=trident:800x600,bpp=16,noaccel
*/
-int tridentfb_setup(char *options)
+#ifndef MODULE
+static int tridentfb_setup(char *options)
{
char * opt;
if (!options || !*options)
@@ -1279,6 +1280,7 @@
}
return 0;
}
+#endif
static struct fb_ops tridentfb_ops = {
.owner = THIS_MODULE,
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
^ permalink raw reply [flat|nested] 2+ messages in thread* [2.6 patch] tridentfb.c: make some code static
@ 2004-11-21 15:36 Adrian Bunk
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Bunk @ 2004-11-21 15:36 UTC (permalink / raw)
To: Jani Monoses; +Cc: Antonino Daplas, linux-kernel, linux-fbdev-devel
The patch below makes some needlessly global code static.
diffstat output:
drivers/video/tridentfb.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc2-mm2-full/drivers/video/tridentfb.c.old 2004-11-21 15:01:33.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/tridentfb.c 2004-11-21 15:03:19.000000000 +0100
@@ -31,7 +31,7 @@
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 tridentfb_par default_par;
@@ -91,7 +91,7 @@
static int chip3D;
static int chipcyber;
-int is3Dchip(int id)
+static int is3Dchip(int id)
{
return ((id == BLADE3D) || (id == CYBERBLADEE4) ||
(id == CYBERBLADEi7) || (id == CYBERBLADEi7D) ||
@@ -104,7 +104,7 @@
(id == CYBERBLADEXPAi1));
}
-int iscyber(int id)
+static int iscyber(int id)
{
switch (id) {
case CYBER9388:
@@ -1223,9 +1223,9 @@
.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
char *option = NULL;
@@ -1238,7 +1238,7 @@
return pci_module_init(&tridentfb_pci_driver);
}
-void __exit tridentfb_exit(void)
+static void __exit tridentfb_exit(void)
{
pci_unregister_driver(&tridentfb_pci_driver);
}
@@ -1249,7 +1249,8 @@
* example:
* video=trident:800x600,bpp=16,noaccel
*/
-int tridentfb_setup(char *options)
+#ifndef MODULE
+static int tridentfb_setup(char *options)
{
char * opt;
if (!options || !*options)
@@ -1279,6 +1280,7 @@
}
return 0;
}
+#endif
static struct fb_ops tridentfb_ops = {
.owner = THIS_MODULE,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-02-06 23:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-06 23:33 [2.6 patch] tridentfb.c: make some code static Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2004-11-21 15:36 Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).