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>
This commit is contained in:
parent
ecaa3bda65
commit
c2f128a1fe
|
@ -299,7 +299,6 @@ void cpc_tty_init(pc300dev_t * dev);
|
||||||
void cpc_tty_unregister_service(pc300dev_t * pc300dev);
|
void cpc_tty_unregister_service(pc300dev_t * pc300dev);
|
||||||
void cpc_tty_receive(pc300dev_t * pc300dev);
|
void cpc_tty_receive(pc300dev_t * pc300dev);
|
||||||
void cpc_tty_trigger_poll(pc300dev_t * pc300dev);
|
void cpc_tty_trigger_poll(pc300dev_t * pc300dev);
|
||||||
void cpc_tty_reset_var(void);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/************************/
|
/************************/
|
||||||
|
@ -3421,9 +3420,6 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
if (first_time) {
|
if (first_time) {
|
||||||
first_time = 0;
|
first_time = 0;
|
||||||
show_version();
|
show_version();
|
||||||
#ifdef CONFIG_PC300_MLPPP
|
|
||||||
cpc_tty_reset_var();
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((err = pci_enable_device(pdev)) < 0)
|
if ((err = pci_enable_device(pdev)) < 0)
|
||||||
|
|
|
@ -139,7 +139,6 @@ void cpc_tty_init(pc300dev_t *dev);
|
||||||
void cpc_tty_unregister_service(pc300dev_t *pc300dev);
|
void cpc_tty_unregister_service(pc300dev_t *pc300dev);
|
||||||
void cpc_tty_receive(pc300dev_t *pc300dev);
|
void cpc_tty_receive(pc300dev_t *pc300dev);
|
||||||
void cpc_tty_trigger_poll(pc300dev_t *pc300dev);
|
void cpc_tty_trigger_poll(pc300dev_t *pc300dev);
|
||||||
void cpc_tty_reset_var(void);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* PC300 TTY clear "signal"
|
* PC300 TTY clear "signal"
|
||||||
|
@ -1078,20 +1077,3 @@ void cpc_tty_trigger_poll(pc300dev_t *pc300dev)
|
||||||
}
|
}
|
||||||
schedule_work(&(cpc_tty->tty_tx_work));
|
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));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue