[2.6 patch] sstfb.c: make some code static

[2.6 patch] sstfb.c: make some code static

[Adrian Bunk]

This patch below makes some needlessly global code static.
Additionally, it adds #ifdefs for code only used in the 
modular/nonmodular cases.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

This patch was already sent on:
- 21 Nov 2004

 drivers/video/sstfb.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

--- linux-2.6.10-rc2-mm2-full/drivers/video/sstfb.c.old	2004-11-21 14:59:23.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/sstfb.c	2004-11-21 16:02:43.000000000 +0100
@@ -1338,8 +1338,8 @@
 /*
  * Interface to the world
  */
-
-int  __init sstfb_setup(char *options)
+#ifndef MODULE
+static int  __init sstfb_setup(char *options)
 {
 	char *this_opt;
 
@@ -1372,6 +1372,7 @@
 	}
 	return 0;
 }
+#endif
 
 static struct fb_ops sstfb_ops = {
 	.owner		= THIS_MODULE,
@@ -1565,7 +1566,7 @@
 };
 
 
-int __devinit sstfb_init(void)
+static int __devinit sstfb_init(void)
 {
 #ifndef MODULE
 	char *option = NULL;
@@ -1577,10 +1578,12 @@
 	return pci_module_init(&sstfb_driver);
 }
 
-void __devexit sstfb_exit(void)
+#ifdef MODULE
+static void __devexit sstfb_exit(void)
 {
 	pci_unregister_driver(&sstfb_driver);
 }
+#endif
 
 
 /*


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

[2.6 patch] sstfb.c: make some code static

[Adrian Bunk]

The patch below makes some needlessly global code static.


diffstat output:
 drivers/video/sstfb.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.10-rc2-mm2-full/drivers/video/sstfb.c.old	2004-11-21 14:59:23.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/sstfb.c	2004-11-21 16:02:43.000000000 +0100
@@ -1338,8 +1338,8 @@
 /*
  * Interface to the world
  */
-
-int  __init sstfb_setup(char *options)
+#ifndef MODULE
+static int  __init sstfb_setup(char *options)
 {
 	char *this_opt;
 
@@ -1372,6 +1372,7 @@
 	}
 	return 0;
 }
+#endif
 
 static struct fb_ops sstfb_ops = {
 	.owner		= THIS_MODULE,
@@ -1565,7 +1566,7 @@
 };
 
 
-int __devinit sstfb_init(void)
+static int __devinit sstfb_init(void)
 {
 #ifndef MODULE
 	char *option = NULL;
@@ -1577,10 +1578,12 @@
 	return pci_module_init(&sstfb_driver);
 }
 
-void __devexit sstfb_exit(void)
+#ifdef MODULE
+static void __devexit sstfb_exit(void)
 {
 	pci_unregister_driver(&sstfb_driver);
 }
+#endif
 
 
 /*

Re: [2.6 patch] sstfb.c: make some code static

[Alan Cox]

On Sul, 2004-11-21 at 15:36, Adrian Bunk wrote:
> The patch below makes some needlessly global code static.

No it doesn't. It makes some functions static (which is fine) and adds
some nasty messy pointless #ifdefs. It touches no variable at all.

Please check your description texts and also don't fill the kernel with
ifdef crap. Probably the __setup stuff should be a module param new
style too.



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/

Re: [2.6 patch] sstfb.c: make some code static

[Adrian Bunk]

On Wed, Nov 24, 2004 at 10:49:47PM +0000, Alan Cox wrote:
> On Sul, 2004-11-21 at 15:36, Adrian Bunk wrote:
> > The patch below makes some needlessly global code static.
> 
> No it doesn't. It makes some functions static (which is fine) and adds
> some nasty messy pointless #ifdefs. It touches no variable at all.
> 
> Please check your description texts and also don't fill the kernel with
> ifdef crap. Probably the __setup stuff should be a module param new
> style too.

Yes, the description text could have been better.

The "ifdef crap" comes from the fact, that after making the functions 
static, gcc warns if they are unused.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/

Re: [2.6 patch] sstfb.c: make some code static

[Alan Cox]

On Iau, 2004-11-25 at 15:36, Adrian Bunk wrote:
> The "ifdef crap" comes from the fact, that after making the functions 
> static, gcc warns if they are unused.

__attribute__ is your friend in that situation.



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/