NET: pc300, do not zero global variables

They are in .bss which is initialized to zeros when the module is
loaded/kernel booted.

What a strange way to do the initialization once in the pci probe
routine...

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: netdev@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 1eeedd6a10b1261b3853542accb4c600158490b0..a6dd00de41a4d6edd0eb5f2b7b6c5b3093f2a293 100644 (file)
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -299,7 +299,6 @@ void cpc_tty_init(pc300dev_t * dev);
 void cpc_tty_unregister_service(pc300dev_t * pc300dev);
 void cpc_tty_receive(pc300dev_t * pc300dev);
 void cpc_tty_trigger_poll(pc300dev_t * pc300dev);
-void cpc_tty_reset_var(void);
 #endif
 
 /************************/
@@ -3421,9 +3420,6 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (first_time) {
                first_time = 0;
                show_version();
-#ifdef CONFIG_PC300_MLPPP
-               cpc_tty_reset_var();
-#endif
        }
 
        if ((err = pci_enable_device(pdev)) < 0)

diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index d47d2cd10475c432edb04299c919d0cd2a685a3b..4709f4228561a7ea20e881c484a5f908d31b740c 100644 (file)
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -139,7 +139,6 @@ void cpc_tty_init(pc300dev_t *dev);
 void cpc_tty_unregister_service(pc300dev_t *pc300dev);
 void cpc_tty_receive(pc300dev_t *pc300dev);
 void cpc_tty_trigger_poll(pc300dev_t *pc300dev);
-void cpc_tty_reset_var(void);
 
 /*
  * PC300 TTY clear "signal"
@@ -1078,20 +1077,3 @@ void cpc_tty_trigger_poll(pc300dev_t *pc300dev)
        }
        schedule_work(&(cpc_tty->tty_tx_work)); 
 } 
-
-/*
- * PC300 TTY reset var routine
- * This routine is called by pc300driver to init the TTY area. 
- */
-
-void cpc_tty_reset_var(void)
-{
-       int i ; 
-
-       CPC_TTY_DBG("hdlcX-tty: reset variables\n");
-       /* reset  the tty_driver structure - serial_drv */ 
-       memset(&serial_drv, 0, sizeof(struct tty_driver));
-       for (i=0; i < CPC_TTY_NPORTS; i++){
-               memset(&cpc_tty_area[i],0, sizeof(st_cpc_tty_area)); 
-       }
-}