Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / atm / firestream.c

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 68919a7..7f7ec28 100644 (file)
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -82,14 +82,14 @@ static int num=0x5a;
  * would be interpreted. -- REW */
 
 #define NP FS_NR_FREE_POOLS
-int rx_buf_sizes[NP]  = {128,  256,  512, 1024, 2048, 4096, 16384, 65520};
+static int rx_buf_sizes[NP]  = {128,  256,  512, 1024, 2048, 4096, 16384, 65520};
 /* log2:                 7     8     9    10    11    12    14     16 */
 
 #if 0
-int rx_pool_sizes[NP] = {1024, 1024, 512, 256,  128,  64,   32,    32};
+static int rx_pool_sizes[NP] = {1024, 1024, 512, 256,  128,  64,   32,    32};
 #else
 /* debug */
-int rx_pool_sizes[NP] = {128,  128,  128, 64,   64,   64,   32,    32};
+static int rx_pool_sizes[NP] = {128,  128,  128, 64,   64,   64,   32,    32};
 #endif
 /* log2:                 10    10    9    8     7     6     5      5  */
 /* sumlog2:              17    18    18   18    18    18    19     21 */
@@ -250,7 +250,7 @@ struct reginit_item {
 };
 
 
-struct reginit_item PHY_NTC_INIT[] __devinitdata = {
+static struct reginit_item PHY_NTC_INIT[] __devinitdata = {
        { PHY_CLEARALL, 0x40 }, 
        { 0x12,  0x0001 },
        { 0x13,  0x7605 },
@@ -306,11 +306,11 @@ static int fs_debug = 0;
 
 #ifdef MODULE
 #ifdef DEBUG 
-MODULE_PARM(fs_debug, "i");
+module_param(fs_debug, int, 0644);
 #endif
-MODULE_PARM(loopback, "i");
-MODULE_PARM(num, "i");
-MODULE_PARM(fs_keystream, "i");
+module_param(loopback, int, 0);
+module_param(num, int, 0);
+module_param(fs_keystream, int, 0);
 /* XXX Add rx_buf_sizes, and rx_pool_sizes As per request Amar. -- REW */
 #endif
 
@@ -334,7 +334,7 @@ MODULE_PARM(fs_keystream, "i");
 #define func_exit()  fs_dprintk (FS_DEBUG_FLOW, "fs: exit  %s\n", __FUNCTION__)
 
 
-struct fs_dev *fs_boards = NULL;
+static struct fs_dev *fs_boards = NULL;
 
 #ifdef DEBUG
 
@@ -815,7 +815,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
                                skb_put (skb, qe->p1 & 0xffff); 
                                ATM_SKB(skb)->vcc = atm_vcc;
                                atomic_inc(&atm_vcc->stats->rx);
-                               do_gettimeofday(&skb->stamp);
+                               __net_timestamp(skb);
                                fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
                                atm_vcc->push (atm_vcc, skb);
                                fs_dprintk (FS_DEBUG_ALLOC, "Free rec-d: %p\n", pe);
@@ -1374,7 +1374,7 @@ static void reset_chip (struct fs_dev *dev)
        }
 }
 
-static void __devinit *aligned_kmalloc (int size, int flags, int alignment)
+static void __devinit *aligned_kmalloc (int size, gfp_t flags, int alignment)
 {
        void  *t;
 
@@ -1464,7 +1464,8 @@ static inline int nr_buffers_in_freepool (struct fs_dev *dev, struct freepool *f
    does. I've seen "receive abort: no buffers" and things started
    working again after that...  -- REW */
 
-static void top_off_fp (struct fs_dev *dev, struct freepool *fp, int gfp_flags)
+static void top_off_fp (struct fs_dev *dev, struct freepool *fp,
+                       gfp_t gfp_flags)
 {
        struct FS_BPENTRY *qe, *ne;
        struct sk_buff *skb;
@@ -1921,7 +1922,7 @@ static int __devinit firestream_init_one (struct pci_dev *pci_dev,
        return -ENODEV;
 }
 
-void __devexit firestream_remove_one (struct pci_dev *pdev)
+static void __devexit firestream_remove_one (struct pci_dev *pdev)
 {
        int i;
        struct fs_dev *dev, *nxtdev;
@@ -2012,66 +2013,6 @@ void __devexit firestream_remove_one (struct pci_dev *pdev)
        func_exit ();
 }
 
-
-#if 0
-int __init fs_detect(void)
-{
-       struct pci_dev  *pci_dev;
-       int devs = 0;
-
-       func_enter ();
-       pci_dev = NULL;
-       while ((pci_dev = pci_find_device(PCI_VENDOR_ID_FUJITSU_ME,
-                                         PCI_DEVICE_ID_FUJITSU_FS50, 
-                                         pci_dev))) {
-               if (fs_register_and_init (pci_dev, &fs_pci_tbl[0]))
-                       break;
-               devs++;
-       }
-
-       while ((pci_dev = pci_find_device(PCI_VENDOR_ID_FUJITSU_ME,
-                                         PCI_DEVICE_ID_FUJITSU_FS155, 
-                                         pci_dev))) {
-               if (fs_register_and_init (pci_dev, FS_IS155)) 
-                       break;
-               devs++;
-       }
-       func_exit ();
-       return devs;
-}
-#else
-
-#if 0
-int __init init_PCI (void)
-{ /* Begin init_PCI */
-       
-       int pci_count;
-       printk ("init_PCI\n");
-       /*
-         memset (&firestream_driver, 0, sizeof (firestream_driver));
-         firestream_driver.name = "firestream";
-         firestream_driver.id_table = firestream_pci_tbl;
-         firestream_driver.probe = fs_register_and_init;
-       */
-       pci_count = pci_register_driver (&firestream_driver);
-       
-       if (pci_count <= 0) {
-               pci_unregister_driver (&firestream_driver);
-               pci_count = 0;
-       }
-
-       return(pci_count);
-
-} /* End init_PCI */
-#endif
-#endif
-
-/*
-#ifdef MODULE
-#define firestream_init init_module
-#endif 
-*/
-
 static struct pci_device_id firestream_pci_tbl[] = {
        { PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50, 
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, FS_IS50},
@@ -2094,7 +2035,7 @@ static int __init firestream_init_module (void)
        int error;
 
        func_enter ();
-       error = pci_module_init(&firestream_driver);
+       error = pci_register_driver(&firestream_driver);
        func_exit ();
        return error;
 }
@@ -2110,3 +2051,4 @@ module_exit(firestream_cleanup_module);
 MODULE_LICENSE("GPL");
 
 
+