linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / dgrs.c

diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index 779af17..70b47e4 100644 (file)
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -454,7 +454,7 @@ do_plx_dma(
  *     up some state variables to let the host CPU continue doing
  *     other things until a DMA completion interrupt comes along.
  */
-void
+static void
 dgrs_rcv_frame(
        struct net_device       *dev0,
        DGRS_PRIV       *priv0,
@@ -1150,7 +1150,7 @@ dgrs_download(struct net_device *dev0)
 /*
  *     Probe (init) a board
  */
-int __init 
+static int __init 
 dgrs_probe1(struct net_device *dev)
 {
        DGRS_PRIV       *priv = (DGRS_PRIV *) dev->priv;
@@ -1228,7 +1228,7 @@ err_out:
                return rc;
 }
 
-int __init 
+static int __init 
 dgrs_initclone(struct net_device *dev)
 {
        DGRS_PRIV       *priv = (DGRS_PRIV *) dev->priv;
@@ -1458,6 +1458,8 @@ static struct pci_driver dgrs_pci_driver = {
        .probe = dgrs_pci_probe,
        .remove = __devexit_p(dgrs_pci_remove),
 };
+#else
+static struct pci_driver dgrs_pci_driver = {};
 #endif
 
 
@@ -1534,14 +1536,14 @@ static int      iptrap[4] = { -1 };
 static __u32   ipxnet = -1;
 static int     nicmode = -1;
 
-MODULE_PARM(debug, "i");
-MODULE_PARM(dma, "i");
-MODULE_PARM(hashexpire, "i");
-MODULE_PARM(spantree, "i");
-MODULE_PARM(ipaddr, "1-4i");
-MODULE_PARM(iptrap, "1-4i");
-MODULE_PARM(ipxnet, "i");
-MODULE_PARM(nicmode, "i");
+module_param(debug, int, 0);
+module_param(dma, int, 0);
+module_param(hashexpire, int, 0);
+module_param(spantree, int, 0);
+module_param_array(ipaddr, int, NULL, 0);
+module_param_array(iptrap, int, NULL, 0);
+module_param(ipxnet, int, 0);
+module_param(nicmode, int, 0);
 MODULE_PARM_DESC(debug, "Digi RightSwitch enable debugging (0-1)");
 MODULE_PARM_DESC(dma, "Digi RightSwitch enable BM DMA (0-1)");
 MODULE_PARM_DESC(nicmode, "Digi RightSwitch operating mode (1: switch, 2: multi-NIC)");
@@ -1549,7 +1551,7 @@ MODULE_PARM_DESC(nicmode, "Digi RightSwitch operating mode (1: switch, 2: multi-
 static int __init dgrs_init_module (void)
 {
        int     i;
-       int eisacount = 0, pcicount = 0;
+       int     cardcount = 0;
 
        /*
         *      Command line variable overrides
@@ -1591,15 +1593,13 @@ static int __init dgrs_init_module (void)
         *      Find and configure all the cards
         */
 #ifdef CONFIG_EISA
-       eisacount = eisa_driver_register(&dgrs_eisa_driver);
-       if (eisacount < 0)
-               return eisacount;
-#endif
-#ifdef CONFIG_PCI
-       pcicount = pci_register_driver(&dgrs_pci_driver);
-       if (pcicount)
-               return pcicount;
+       cardcount = eisa_driver_register(&dgrs_eisa_driver);
+       if (cardcount < 0)
+               return cardcount;
 #endif
+       cardcount = pci_register_driver(&dgrs_pci_driver);
+       if (cardcount)
+               return cardcount;
        return 0;
 }