Download Firefox: WindowsMac OS X
logo       
Google Custom Search
    AddThis Social Bookmark Button
-->

[9/15] orinoco merge preliminaries - make things static: msg#00030

Subject: [9/15] orinoco merge preliminaries - make things static
Make various functions and variables static which always should have
been, but weren't.

Signed-off-by: David Gibson 
<hermes-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@xxxxxxxxxxxxxxxx>

Index: working-2.6/drivers/net/wireless/orinoco_tmd.c
===================================================================
--- working-2.6.orig/drivers/net/wireless/orinoco_tmd.c 2004-07-28 
15:05:40.435498704 +1000
+++ working-2.6/drivers/net/wireless/orinoco_tmd.c      2004-07-28 
15:05:43.818984336 +1000
@@ -214,7 +214,7 @@
        return pci_module_init(&orinoco_tmd_driver);
 }
 
-void __exit orinoco_tmd_exit(void)
+static void __exit orinoco_tmd_exit(void)
 {
        pci_unregister_driver(&orinoco_tmd_driver);
        current->state = TASK_UNINTERRUPTIBLE;
Index: working-2.6/drivers/net/wireless/orinoco_plx.c
===================================================================
--- working-2.6.orig/drivers/net/wireless/orinoco_plx.c 2004-07-28 
15:05:40.438498248 +1000
+++ working-2.6/drivers/net/wireless/orinoco_plx.c      2004-07-28 
15:05:43.819984184 +1000
@@ -341,7 +341,7 @@
        return pci_module_init(&orinoco_plx_driver);
 }
 
-void __exit orinoco_plx_exit(void)
+static void __exit orinoco_plx_exit(void)
 {
        pci_unregister_driver(&orinoco_plx_driver);
        current->state = TASK_UNINTERRUPTIBLE;
Index: working-2.6/drivers/net/wireless/orinoco_pci.c
===================================================================
--- working-2.6.orig/drivers/net/wireless/orinoco_pci.c 2004-07-28 
15:05:39.586627752 +1000
+++ working-2.6/drivers/net/wireless/orinoco_pci.c      2004-07-28 
15:05:43.820984032 +1000
@@ -387,7 +387,7 @@
        return pci_module_init(&orinoco_pci_driver);
 }
 
-void __exit orinoco_pci_exit(void)
+static void __exit orinoco_pci_exit(void)
 {
        pci_unregister_driver(&orinoco_pci_driver);
 }
Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================
--- working-2.6.orig/drivers/net/wireless/orinoco.c     2004-07-28 
15:05:40.433499008 +1000
+++ working-2.6/drivers/net/wireless/orinoco.c  2004-07-28 15:05:43.829982664 
+1000
@@ -507,7 +507,7 @@
 /********************************************************************/
 
 /* The frequency of each channel in MHz */
-const long channel_frequency[] = {
+static const long channel_frequency[] = {
        2412, 2417, 2422, 2427, 2432, 2437, 2442,
        2447, 2452, 2457, 2462, 2467, 2472, 2484
 };
@@ -515,7 +515,7 @@
 
 /* This tables gives the actual meanings of the bitrate IDs returned
  * by the firmware. */
-struct {
+static struct {
        int bitrate; /* in 100s of kilobits */
        int automatic;
        u16 agere_txratectrl;
@@ -643,14 +643,14 @@
        return err;
 }
 
-struct net_device_stats *orinoco_get_stats(struct net_device *dev)
+static struct net_device_stats *orinoco_get_stats(struct net_device *dev)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        
        return &priv->stats;
 }
 
-struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
+static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        hermes_t *hw = &priv->hw;
@@ -985,9 +985,9 @@
                }
 }
 
-void orinoco_stat_gather(struct net_device *dev,
-                        struct sk_buff *skb,
-                        struct hermes_rx_descriptor *desc)
+static void orinoco_stat_gather(struct net_device *dev,
+                               struct sk_buff *skb,
+                               struct hermes_rx_descriptor *desc)
 {
        struct orinoco_private *priv = netdev_priv(dev);
 

-- 
David Gibson                    | For every complex problem there is a
david AT gibson.dropbear.id.au  | solution which is simple, neat and
                                | wrong.
http://www.ozlabs.org/people/dgibson


-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click


<Prev in Thread] Current Thread [Next in Thread>