diff options
| author |   Jiri Slaby <jslaby@suse.cz> | 2012-03-05 14:52:03 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 11:47:01 -0800 |
| commit | c2f128a1fed866dca94d52b3f0b1e40726e2352a (patch) | |
| tree | ad1c76107d9ce2d1dc613aa8d5d3ff257b45633d /drivers/net/wan | |
| parent | TTY: ipwireless, fix tty->index handling (diff) | |
| download | linux-dev-c2f128a1fed866dca94d52b3f0b1e40726e2352a.tar.xz linux-dev-c2f128a1fed866dca94d52b3f0b1e40726e2352a.zip | |
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>
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/pc300_drv.c | 4 | ||||
| -rw-r--r-- | drivers/net/wan/pc300_tty.c | 18 |
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index 1eeedd6a10b1..a6dd00de41a4 100644 --- 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 d47d2cd10475..4709f4228561 100644 --- 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)); - } -} |