aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/cyclades.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/cyclades.c')
-rw-r--r--drivers/char/cyclades.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 1b4ff138b8ff..a79a4b213bba 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -4914,15 +4914,12 @@ static int __devinit cy_init_Ze(unsigned long cy_pci_phys0,
4914#endif /* CONFIG_CYZ_INTR */ 4914#endif /* CONFIG_CYZ_INTR */
4915 4915
4916 /* set cy_card */ 4916 /* set cy_card */
4917 cy_card[j].base_phys = cy_pci_phys2;
4918 cy_card[j].ctl_phys = cy_pci_phys0;
4919 cy_card[j].base_addr = cy_pci_addr2; 4917 cy_card[j].base_addr = cy_pci_addr2;
4920 cy_card[j].ctl_addr = cy_pci_addr0; 4918 cy_card[j].ctl_addr = cy_pci_addr0;
4921 cy_card[j].irq = (int)cy_pci_irq; 4919 cy_card[j].irq = (int)cy_pci_irq;
4922 cy_card[j].bus_index = 1; 4920 cy_card[j].bus_index = 1;
4923 cy_card[j].first_line = cy_next_channel; 4921 cy_card[j].first_line = cy_next_channel;
4924 cy_card[j].num_chips = -1; 4922 cy_card[j].num_chips = -1;
4925 cy_card[j].pdev = pdev;
4926 cy_init_card(&cy_card[j], j); 4923 cy_init_card(&cy_card[j], j);
4927 pci_set_drvdata(pdev, &cy_card[j]); 4924 pci_set_drvdata(pdev, &cy_card[j]);
4928 4925
@@ -5066,15 +5063,12 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
5066 } 5063 }
5067 5064
5068 /* set cy_card */ 5065 /* set cy_card */
5069 cy_card[j].base_phys = (ulong) cy_pci_phys2;
5070 cy_card[j].ctl_phys = (ulong) cy_pci_phys0;
5071 cy_card[j].base_addr = cy_pci_addr2; 5066 cy_card[j].base_addr = cy_pci_addr2;
5072 cy_card[j].ctl_addr = cy_pci_addr0; 5067 cy_card[j].ctl_addr = cy_pci_addr0;
5073 cy_card[j].irq = (int)cy_pci_irq; 5068 cy_card[j].irq = (int)cy_pci_irq;
5074 cy_card[j].bus_index = 1; 5069 cy_card[j].bus_index = 1;
5075 cy_card[j].first_line = cy_next_channel; 5070 cy_card[j].first_line = cy_next_channel;
5076 cy_card[j].num_chips = cy_pci_nchan / 4; 5071 cy_card[j].num_chips = cy_pci_nchan / 4;
5077 cy_card[j].pdev = pdev;
5078 cy_init_card(&cy_card[j], j); 5072 cy_init_card(&cy_card[j], j);
5079 pci_set_drvdata(pdev, &cy_card[j]); 5073 pci_set_drvdata(pdev, &cy_card[j]);
5080 5074
@@ -5253,15 +5247,12 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
5253#endif /* CONFIG_CYZ_INTR */ 5247#endif /* CONFIG_CYZ_INTR */
5254 5248
5255 /* set cy_card */ 5249 /* set cy_card */
5256 cy_card[j].base_phys = cy_pci_phys2;
5257 cy_card[j].ctl_phys = cy_pci_phys0;
5258 cy_card[j].base_addr = cy_pci_addr2; 5250 cy_card[j].base_addr = cy_pci_addr2;
5259 cy_card[j].ctl_addr = cy_pci_addr0; 5251 cy_card[j].ctl_addr = cy_pci_addr0;
5260 cy_card[j].irq = (int)cy_pci_irq; 5252 cy_card[j].irq = (int)cy_pci_irq;
5261 cy_card[j].bus_index = 1; 5253 cy_card[j].bus_index = 1;
5262 cy_card[j].first_line = cy_next_channel; 5254 cy_card[j].first_line = cy_next_channel;
5263 cy_card[j].num_chips = -1; 5255 cy_card[j].num_chips = -1;
5264 cy_card[j].pdev = pdev;
5265 cy_init_card(&cy_card[j], j); 5256 cy_init_card(&cy_card[j], j);
5266 pci_set_drvdata(pdev, &cy_card[j]); 5257 pci_set_drvdata(pdev, &cy_card[j]);
5267 5258