diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-03-05 08:52:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 14:47:01 -0500 |
commit | c2f128a1fed866dca94d52b3f0b1e40726e2352a (patch) | |
tree | ad1c76107d9ce2d1dc613aa8d5d3ff257b45633d /drivers/net/wan | |
parent | ecaa3bda65cefebfce11cc7be4b8d9203f5ce12c (diff) |
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); | |||
299 | void cpc_tty_unregister_service(pc300dev_t * pc300dev); | 299 | void cpc_tty_unregister_service(pc300dev_t * pc300dev); |
300 | void cpc_tty_receive(pc300dev_t * pc300dev); | 300 | void cpc_tty_receive(pc300dev_t * pc300dev); |
301 | void cpc_tty_trigger_poll(pc300dev_t * pc300dev); | 301 | void cpc_tty_trigger_poll(pc300dev_t * pc300dev); |
302 | void cpc_tty_reset_var(void); | ||
303 | #endif | 302 | #endif |
304 | 303 | ||
305 | /************************/ | 304 | /************************/ |
@@ -3421,9 +3420,6 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3421 | if (first_time) { | 3420 | if (first_time) { |
3422 | first_time = 0; | 3421 | first_time = 0; |
3423 | show_version(); | 3422 | show_version(); |
3424 | #ifdef CONFIG_PC300_MLPPP | ||
3425 | cpc_tty_reset_var(); | ||
3426 | #endif | ||
3427 | } | 3423 | } |
3428 | 3424 | ||
3429 | if ((err = pci_enable_device(pdev)) < 0) | 3425 | 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); | |||
139 | void cpc_tty_unregister_service(pc300dev_t *pc300dev); | 139 | void cpc_tty_unregister_service(pc300dev_t *pc300dev); |
140 | void cpc_tty_receive(pc300dev_t *pc300dev); | 140 | void cpc_tty_receive(pc300dev_t *pc300dev); |
141 | void cpc_tty_trigger_poll(pc300dev_t *pc300dev); | 141 | void cpc_tty_trigger_poll(pc300dev_t *pc300dev); |
142 | void cpc_tty_reset_var(void); | ||
143 | 142 | ||
144 | /* | 143 | /* |
145 | * PC300 TTY clear "signal" | 144 | * PC300 TTY clear "signal" |
@@ -1078,20 +1077,3 @@ void cpc_tty_trigger_poll(pc300dev_t *pc300dev) | |||
1078 | } | 1077 | } |
1079 | schedule_work(&(cpc_tty->tty_tx_work)); | 1078 | schedule_work(&(cpc_tty->tty_tx_work)); |
1080 | } | 1079 | } |
1081 | |||
1082 | /* | ||
1083 | * PC300 TTY reset var routine | ||
1084 | * This routine is called by pc300driver to init the TTY area. | ||
1085 | */ | ||
1086 | |||
1087 | void cpc_tty_reset_var(void) | ||
1088 | { | ||
1089 | int i ; | ||
1090 | |||
1091 | CPC_TTY_DBG("hdlcX-tty: reset variables\n"); | ||
1092 | /* reset the tty_driver structure - serial_drv */ | ||
1093 | memset(&serial_drv, 0, sizeof(struct tty_driver)); | ||
1094 | for (i=0; i < CPC_TTY_NPORTS; i++){ | ||
1095 | memset(&cpc_tty_area[i],0, sizeof(st_cpc_tty_area)); | ||
1096 | } | ||
1097 | } | ||