Skip to content

L
linux-davinci-2.6.23
Commit 3046d50e authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files
Options

Char: cyclades, simplify variables initialization 

- do not init static variables to 0
- simplify cy_init_card -- use memset(0) and do not zero each element
  separately, also reorder init, so that same entries are inited at one
  place
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 31b4f0a1
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 112 deletions
drivers/char/cyclades.c
View file @ 3046d50e
...@@ -718,8 +718,8 @@ static unsigned int cy_isa_addresses[] = { ...@@ -718,8 +718,8 @@ static unsigned int cy_isa_addresses[] = {
#define NR_ISA_ADDRS ARRAY_SIZE(cy_isa_addresses) #define NR_ISA_ADDRS ARRAY_SIZE(cy_isa_addresses)
#ifdef MODULE #ifdef MODULE
static long maddr[NR_CARDS] = { 0, }; static long maddr[NR_CARDS];
static int irq[NR_CARDS] = { 0, }; static int irq[NR_CARDS];
module_param_array(maddr, long, NULL, 0); module_param_array(maddr, long, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_array(irq, int, NULL, 0);
...@@ -4505,6 +4505,8 @@ static void __devinit cy_init_card(struct cyclades_card *cinfo, ...@@ -4505,6 +4505,8 @@ static void __devinit cy_init_card(struct cyclades_card *cinfo,
unsigned short chip_number; unsigned short chip_number;
int index, port; int index, port;
spin_lock_init(&cinfo->card_lock);
if (IS_CYC_Z(*cinfo)) { /* Cyclades-Z */ if (IS_CYC_Z(*cinfo)) { /* Cyclades-Z */
mailbox = readl(&((struct RUNTIME_9060 __iomem *) mailbox = readl(&((struct RUNTIME_9060 __iomem *)
cinfo->ctl_addr)->mail_box_0); cinfo->ctl_addr)->mail_box_0);
...@@ -4512,104 +4514,47 @@ static void __devinit cy_init_card(struct cyclades_card *cinfo, ...@@ -4512,104 +4514,47 @@ static void __devinit cy_init_card(struct cyclades_card *cinfo,
cinfo->intr_enabled = 0; cinfo->intr_enabled = 0;
cinfo->nports = 0; /* Will be correctly set later, after cinfo->nports = 0; /* Will be correctly set later, after
Z FW is loaded */ Z FW is loaded */
spin_lock_init(&cinfo->card_lock); } else {
for (port = cinfo->first_line; index = cinfo->bus_index;
port < cinfo->first_line + nports; port++) { nports = cinfo->nports = CyPORTS_PER_CHIP * cinfo->num_chips;
info = &cy_port[port]; }
info->magic = CYCLADES_MAGIC;
for (port = cinfo->first_line; port < cinfo->first_line + nports;
port++) {
info = &cy_port[port];
memset(info, 0, sizeof(*info));
info->magic = CYCLADES_MAGIC;
info->card = board;
info->line = port;
info->flags = STD_COM_FLAGS;
info->closing_wait = CLOSING_WAIT_DELAY;
info->close_delay = 5 * HZ / 10;
INIT_WORK(&info->tqueue, do_softint);
init_waitqueue_head(&info->open_wait);
init_waitqueue_head(&info->close_wait);
init_waitqueue_head(&info->shutdown_wait);
init_waitqueue_head(&info->delta_msr_wait);
if (IS_CYC_Z(*cinfo)) {
info->type = PORT_STARTECH; info->type = PORT_STARTECH;
info->card = board;
info->line = port;
info->chip_rev = 0;
info->flags = STD_COM_FLAGS;
info->tty = NULL;
if (mailbox == ZO_V1) if (mailbox == ZO_V1)
info->xmit_fifo_size = CYZ_FIFO_SIZE; info->xmit_fifo_size = CYZ_FIFO_SIZE;
else else
info->xmit_fifo_size = info->xmit_fifo_size = 4 * CYZ_FIFO_SIZE;
4 * CYZ_FIFO_SIZE;
info->cor1 = 0;
info->cor2 = 0;
info->cor3 = 0;
info->cor4 = 0;
info->cor5 = 0;
info->tbpr = 0;
info->tco = 0;
info->rbpr = 0;
info->rco = 0;
info->custom_divisor = 0;
info->close_delay = 5 * HZ / 10;
info->closing_wait = CLOSING_WAIT_DELAY;
info->icount.cts = info->icount.dsr =
info->icount.rng = info->icount.dcd = 0;
info->icount.rx = info->icount.tx = 0;
info->icount.frame = info->icount.parity = 0;
info->icount.overrun = info->icount.brk = 0;
info->x_char = 0;
info->event = 0;
info->count = 0;
info->blocked_open = 0;
info->default_threshold = 0;
info->default_timeout = 0;
INIT_WORK(&info->tqueue, do_softint);
init_waitqueue_head(&info->open_wait);
init_waitqueue_head(&info->close_wait);
init_waitqueue_head(&info->shutdown_wait);
init_waitqueue_head(&info->delta_msr_wait);
/* info->session */
/* info->pgrp */
info->read_status_mask = 0;
/* info->timeout */
/* Bentson's vars */
info->jiffies[0] = 0;
info->jiffies[1] = 0;
info->jiffies[2] = 0;
info->rflush_count = 0;
#ifdef CONFIG_CYZ_INTR #ifdef CONFIG_CYZ_INTR
init_timer(&cyz_rx_full_timer[port]); init_timer(&cyz_rx_full_timer[port]);
cyz_rx_full_timer[port].function = NULL; cyz_rx_full_timer[port].function = NULL;
#endif #endif
} } else {
#ifndef CONFIG_CYZ_INTR
if (!timer_pending(&cyz_timerlist)) {
mod_timer(&cyz_timerlist, jiffies + 1);
#ifdef CY_PCI_DEBUG
printk(KERN_DEBUG "Cyclades-Z polling initialized\n");
#endif
}
#endif /* CONFIG_CYZ_INTR */
} else { /* Cyclom-Y of some kind */
index = cinfo->bus_index;
spin_lock_init(&cinfo->card_lock);
cinfo->nports = CyPORTS_PER_CHIP * cinfo->num_chips;
for (port = cinfo->first_line;
port < cinfo->first_line + cinfo->nports; port++) {
info = &cy_port[port];
info->magic = CYCLADES_MAGIC;
info->type = PORT_CIRRUS; info->type = PORT_CIRRUS;
info->card = board;
info->line = port;
info->flags = STD_COM_FLAGS;
info->tty = NULL;
info->xmit_fifo_size = CyMAX_CHAR_FIFO; info->xmit_fifo_size = CyMAX_CHAR_FIFO;
info->cor1 = info->cor1 = CyPARITY_NONE | Cy_1_STOP | Cy_8_BITS;
CyPARITY_NONE | Cy_1_STOP | Cy_8_BITS;
info->cor2 = CyETC; info->cor2 = CyETC;
info->cor3 = 0x08; /* _very_ small rcv threshold */ info->cor3 = 0x08; /* _very_ small rcv threshold */
info->cor4 = 0;
info->cor5 = 0;
info->custom_divisor = 0;
info->close_delay = 5 * HZ / 10;
info->closing_wait = CLOSING_WAIT_DELAY;
info->icount.cts = info->icount.dsr =
info->icount.rng = info->icount.dcd = 0;
info->icount.rx = info->icount.tx = 0;
info->icount.frame = info->icount.parity = 0;
info->icount.overrun = info->icount.brk = 0;
chip_number = (port - cinfo->first_line) / 4; chip_number = (port - cinfo->first_line) / 4;
if ((info->chip_rev = if ((info->chip_rev = readb(cinfo->base_addr +
readb(cinfo->base_addr +
(cy_chip_offset[chip_number] << (cy_chip_offset[chip_number] <<
index) + (CyGFRCR << index))) >= index) + (CyGFRCR << index))) >=
CD1400_REV_J) { CD1400_REV_J) {
...@@ -4618,35 +4563,28 @@ static void __devinit cy_init_card(struct cyclades_card *cinfo, ...@@ -4618,35 +4563,28 @@ static void __devinit cy_init_card(struct cyclades_card *cinfo,
info->tco = baud_co_60[13]; /* Tx CO */ info->tco = baud_co_60[13]; /* Tx CO */
info->rbpr = baud_bpr_60[13]; /* Rx BPR */ info->rbpr = baud_bpr_60[13]; /* Rx BPR */
info->rco = baud_co_60[13]; /* Rx CO */ info->rco = baud_co_60[13]; /* Rx CO */
info->rflow = 0;
info->rtsdtr_inv = 1; info->rtsdtr_inv = 1;
} else { } else {
info->tbpr = baud_bpr_25[13]; /* Tx BPR */ info->tbpr = baud_bpr_25[13]; /* Tx BPR */
info->tco = baud_co_25[13]; /* Tx CO */ info->tco = baud_co_25[13]; /* Tx CO */
info->rbpr = baud_bpr_25[13]; /* Rx BPR */ info->rbpr = baud_bpr_25[13]; /* Rx BPR */
info->rco = baud_co_25[13]; /* Rx CO */ info->rco = baud_co_25[13]; /* Rx CO */
info->rflow = 0;
info->rtsdtr_inv = 0; info->rtsdtr_inv = 0;
} }
info->x_char = 0; info->read_status_mask = CyTIMEOUT | CySPECHAR |
info->event = 0; CyBREAK | CyPARITY | CyFRAME | CyOVERRUN;
info->count = 0;
info->blocked_open = 0;
info->default_threshold = 0;
info->default_timeout = 0;
INIT_WORK(&info->tqueue, do_softint);
init_waitqueue_head(&info->open_wait);
init_waitqueue_head(&info->close_wait);
init_waitqueue_head(&info->shutdown_wait);
init_waitqueue_head(&info->delta_msr_wait);
/* info->session */
/* info->pgrp */
info->read_status_mask =
CyTIMEOUT | CySPECHAR | CyBREAK
| CyPARITY | CyFRAME | CyOVERRUN;
/* info->timeout */
} }
} }
#ifndef CONFIG_CYZ_INTR
if (IS_CYC_Z(*cinfo) && !timer_pending(&cyz_timerlist)) {
mod_timer(&cyz_timerlist, jiffies + 1);
#ifdef CY_PCI_DEBUG
printk(KERN_DEBUG "Cyclades-Z polling initialized\n");
#endif
}
#endif
} }
/* initialize chips on Cyclom-Y card -- return number of valid /* initialize chips on Cyclom-Y card -- return number of valid
...@@ -5369,12 +5307,6 @@ static int __init cy_init(void) ...@@ -5369,12 +5307,6 @@ static int __init cy_init(void)
goto err_frtty; goto err_frtty;
} }
for (i = 0; i < NR_CARDS; i++) {
/* base_addr=0 indicates board not found */
cy_card[i].base_addr = NULL;
}
/* invalidate remaining cy_port structures */
for (i = 0; i < NR_PORTS; i++) { for (i = 0; i < NR_PORTS; i++) {
cy_port[i].line = -1; cy_port[i].line = -1;
cy_port[i].magic = -1; cy_port[i].magic = -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment