Char: cyclades, init card struct immediately
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 85c734b..c7e1433 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -4834,6 +4834,7 @@
cy_card[j].bus_index = 0;
cy_card[j].first_line = cy_next_channel;
cy_card[j].num_chips = cy_isa_nchan / 4;
+ cy_init_card(&cy_card[j], j);
nboard++;
/* print message */
@@ -4931,6 +4932,7 @@
cy_card[j].first_line = cy_next_channel;
cy_card[j].num_chips = -1;
cy_card[j].pdev = pdev;
+ cy_init_card(&cy_card[j], j);
pci_set_drvdata(pdev, &cy_card[j]);
/* print message */
@@ -5080,6 +5082,7 @@
cy_card[j].first_line = cy_next_channel;
cy_card[j].num_chips = cy_pci_nchan / 4;
cy_card[j].pdev = pdev;
+ cy_init_card(&cy_card[j], j);
pci_set_drvdata(pdev, &cy_card[j]);
/* enable interrupts in the PCI interface */
@@ -5263,6 +5266,7 @@
cy_card[j].first_line = cy_next_channel;
cy_card[j].num_chips = -1;
cy_card[j].pdev = pdev;
+ cy_init_card(&cy_card[j], j);
pci_set_drvdata(pdev, &cy_card[j]);
/* print message */
@@ -5327,6 +5331,7 @@
{
#ifdef CONFIG_PCI
struct cyclades_card *cinfo = pci_get_drvdata(pdev);
+ unsigned int i;
pci_iounmap(pdev, cinfo->base_addr);
if (cinfo->ctl_addr)
@@ -5340,6 +5345,10 @@
pci_release_regions(pdev);
cinfo->base_addr = NULL;
+ for (i = cinfo->first_line; i < cinfo->first_line + cinfo->nports; i++){
+ cy_port[i].line = -1;
+ cy_port[i].magic = -1;
+ }
#endif
}
@@ -5483,6 +5492,12 @@
cy_card[i].base_addr = NULL;
}
+ /* invalidate remaining cy_port structures */
+ for (i = 0; i < NR_PORTS; i++) {
+ cy_port[i].line = -1;
+ cy_port[i].magic = -1;
+ }
+
/* the code below is responsible to find the boards. Each different
type of board has its own detection routine. If a board is found,
the next cy_card structure available is set by the detection
@@ -5498,29 +5513,7 @@
cy_nboard = cy_isa_nboard + cy_pci_nboard;
- /* invalidate remaining cy_card structures */
- for (i = 0; i < NR_CARDS; i++) {
- if (cy_card[i].base_addr == 0) {
- cy_card[i].first_line = -1;
- cy_card[i].ctl_addr = NULL;
- cy_card[i].irq = 0;
- cy_card[i].bus_index = 0;
- cy_card[i].first_line = 0;
- cy_card[i].num_chips = 0;
- }
- }
- /* invalidate remaining cy_port structures */
- for (i = cy_next_channel; i < NR_PORTS; i++) {
- cy_port[i].line = -1;
- cy_port[i].magic = -1;
- }
-
- /* initialize per-port data structures for each valid board found */
- for (i = 0; i < cy_nboard; i++)
- cy_init_card(&cy_card[i], i);
-
return 0;
-
} /* cy_init */
static void __exit cy_cleanup_module(void)
