diff options
-rw-r--r-- | drivers/char/cyclades.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index a79a4b213bba..c12dbb1f5682 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
@@ -4916,7 +4916,7 @@ static int __devinit cy_init_Ze(unsigned long cy_pci_phys0, | |||
4916 | /* set cy_card */ | 4916 | /* set cy_card */ |
4917 | cy_card[j].base_addr = cy_pci_addr2; | 4917 | cy_card[j].base_addr = cy_pci_addr2; |
4918 | cy_card[j].ctl_addr = cy_pci_addr0; | 4918 | cy_card[j].ctl_addr = cy_pci_addr0; |
4919 | cy_card[j].irq = (int)cy_pci_irq; | 4919 | cy_card[j].irq = cy_pci_irq; |
4920 | cy_card[j].bus_index = 1; | 4920 | cy_card[j].bus_index = 1; |
4921 | cy_card[j].first_line = cy_next_channel; | 4921 | cy_card[j].first_line = cy_next_channel; |
4922 | cy_card[j].num_chips = -1; | 4922 | cy_card[j].num_chips = -1; |
@@ -4929,8 +4929,7 @@ static int __devinit cy_init_Ze(unsigned long cy_pci_phys0, | |||
4929 | if ((cy_pci_irq != 0) && (cy_pci_irq != 255)) | 4929 | if ((cy_pci_irq != 0) && (cy_pci_irq != 255)) |
4930 | printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, IRQ%d, ", | 4930 | printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, IRQ%d, ", |
4931 | j + 1, (ulong) cy_pci_phys2, | 4931 | j + 1, (ulong) cy_pci_phys2, |
4932 | (ulong) (cy_pci_phys2 + CyPCI_Ze_win - 1), | 4932 | (ulong) (cy_pci_phys2 + CyPCI_Ze_win - 1), cy_pci_irq); |
4933 | (int)cy_pci_irq); | ||
4934 | else | 4933 | else |
4935 | #endif /* CONFIG_CYZ_INTR */ | 4934 | #endif /* CONFIG_CYZ_INTR */ |
4936 | printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, ", | 4935 | printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, ", |
@@ -4950,7 +4949,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
4950 | const struct pci_device_id *ent) | 4949 | const struct pci_device_id *ent) |
4951 | { | 4950 | { |
4952 | unsigned char cyy_rev_id; | 4951 | unsigned char cyy_rev_id; |
4953 | unsigned char cy_pci_irq; | 4952 | int cy_pci_irq; |
4954 | __u32 cy_pci_phys0, cy_pci_phys2, mailbox; | 4953 | __u32 cy_pci_phys0, cy_pci_phys2, mailbox; |
4955 | void __iomem *cy_pci_addr0, *cy_pci_addr2; | 4954 | void __iomem *cy_pci_addr0, *cy_pci_addr2; |
4956 | unsigned int device_id; | 4955 | unsigned int device_id; |
@@ -4976,8 +4975,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
4976 | #ifdef CY_PCI_DEBUG | 4975 | #ifdef CY_PCI_DEBUG |
4977 | printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ", | 4976 | printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ", |
4978 | pdev->bus->number, pdev->devfn); | 4977 | pdev->bus->number, pdev->devfn); |
4979 | printk("rev_id=%d) IRQ%d\n", | 4978 | printk("rev_id=%d) IRQ%d\n", cyy_rev_id, cy_pci_irq); |
4980 | cyy_rev_id, (int)cy_pci_irq); | ||
4981 | printk("Cyclom-Y/PCI:found winaddr=0x%lx " | 4979 | printk("Cyclom-Y/PCI:found winaddr=0x%lx " |
4982 | "ctladdr=0x%lx\n", | 4980 | "ctladdr=0x%lx\n", |
4983 | (ulong)cy_pci_phys2, (ulong)cy_pci_phys0); | 4981 | (ulong)cy_pci_phys2, (ulong)cy_pci_phys0); |
@@ -5003,7 +5001,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
5003 | printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ", | 5001 | printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ", |
5004 | pdev->bus->number, pdev->devfn); | 5002 | pdev->bus->number, pdev->devfn); |
5005 | printk("rev_id=%d) IRQ%d\n", | 5003 | printk("rev_id=%d) IRQ%d\n", |
5006 | cyy_rev_id, (int)cy_pci_irq); | 5004 | cyy_rev_id, cy_pci_irq); |
5007 | printk("Cyclom-Y/PCI:found winaddr=0x%lx " | 5005 | printk("Cyclom-Y/PCI:found winaddr=0x%lx " |
5008 | "ctladdr=0x%lx\n", | 5006 | "ctladdr=0x%lx\n", |
5009 | (ulong)cy_pci_phys2, | 5007 | (ulong)cy_pci_phys2, |
@@ -5065,7 +5063,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
5065 | /* set cy_card */ | 5063 | /* set cy_card */ |
5066 | cy_card[j].base_addr = cy_pci_addr2; | 5064 | cy_card[j].base_addr = cy_pci_addr2; |
5067 | cy_card[j].ctl_addr = cy_pci_addr0; | 5065 | cy_card[j].ctl_addr = cy_pci_addr0; |
5068 | cy_card[j].irq = (int)cy_pci_irq; | 5066 | cy_card[j].irq = cy_pci_irq; |
5069 | cy_card[j].bus_index = 1; | 5067 | cy_card[j].bus_index = 1; |
5070 | cy_card[j].first_line = cy_next_channel; | 5068 | cy_card[j].first_line = cy_next_channel; |
5071 | cy_card[j].num_chips = cy_pci_nchan / 4; | 5069 | cy_card[j].num_chips = cy_pci_nchan / 4; |
@@ -5101,8 +5099,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
5101 | /* print message */ | 5099 | /* print message */ |
5102 | printk("Cyclom-Y/PCI #%d: 0x%lx-0x%lx, IRQ%d, ", | 5100 | printk("Cyclom-Y/PCI #%d: 0x%lx-0x%lx, IRQ%d, ", |
5103 | j + 1, (ulong)cy_pci_phys2, | 5101 | j + 1, (ulong)cy_pci_phys2, |
5104 | (ulong) (cy_pci_phys2 + CyPCI_Ywin - 1), | 5102 | (ulong) (cy_pci_phys2 + CyPCI_Ywin - 1), cy_pci_irq); |
5105 | (int)cy_pci_irq); | ||
5106 | printk("%d channels starting from port %d.\n", | 5103 | printk("%d channels starting from port %d.\n", |
5107 | cy_pci_nchan, cy_next_channel); | 5104 | cy_pci_nchan, cy_next_channel); |
5108 | for (j = cy_next_channel; | 5105 | for (j = cy_next_channel; |
@@ -5114,8 +5111,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
5114 | /* print message */ | 5111 | /* print message */ |
5115 | printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ", | 5112 | printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ", |
5116 | pdev->bus->number, pdev->devfn); | 5113 | pdev->bus->number, pdev->devfn); |
5117 | printk("rev_id=%d) IRQ%d\n", | 5114 | printk("rev_id=%d) IRQ%d\n", cyy_rev_id, cy_pci_irq); |
5118 | cyy_rev_id, (int)cy_pci_irq); | ||
5119 | printk("Cyclades-Z/PCI: found winaddr=0x%lx " | 5115 | printk("Cyclades-Z/PCI: found winaddr=0x%lx " |
5120 | "ctladdr=0x%lx\n", | 5116 | "ctladdr=0x%lx\n", |
5121 | (ulong)cy_pci_phys2, (ulong)cy_pci_phys0); | 5117 | (ulong)cy_pci_phys2, (ulong)cy_pci_phys0); |
@@ -5126,8 +5122,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
5126 | #ifdef CY_PCI_DEBUG | 5122 | #ifdef CY_PCI_DEBUG |
5127 | printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ", | 5123 | printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ", |
5128 | pdev->bus->number, pdev->devfn); | 5124 | pdev->bus->number, pdev->devfn); |
5129 | printk("rev_id=%d) IRQ%d\n", | 5125 | printk("rev_id=%d) IRQ%d\n", cyy_rev_id, cy_pci_irq); |
5130 | cyy_rev_id, (int)cy_pci_irq); | ||
5131 | printk("Cyclades-Z/PCI: found winaddr=0x%lx " | 5126 | printk("Cyclades-Z/PCI: found winaddr=0x%lx " |
5132 | "ctladdr=0x%lx\n", | 5127 | "ctladdr=0x%lx\n", |
5133 | (ulong) cy_pci_phys2, (ulong) cy_pci_phys0); | 5128 | (ulong) cy_pci_phys2, (ulong) cy_pci_phys0); |
@@ -5144,8 +5139,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
5144 | re-write it to the PCI config. registers. | 5139 | re-write it to the PCI config. registers. |
5145 | This will remain here until we find a permanent | 5140 | This will remain here until we find a permanent |
5146 | fix. */ | 5141 | fix. */ |
5147 | pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, | 5142 | pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, cy_pci_irq); |
5148 | cy_pci_irq); | ||
5149 | 5143 | ||
5150 | mailbox = (__u32)readl(&((struct RUNTIME_9060 __iomem *) | 5144 | mailbox = (__u32)readl(&((struct RUNTIME_9060 __iomem *) |
5151 | cy_pci_addr0)->mail_box_0); | 5145 | cy_pci_addr0)->mail_box_0); |
@@ -5249,7 +5243,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
5249 | /* set cy_card */ | 5243 | /* set cy_card */ |
5250 | cy_card[j].base_addr = cy_pci_addr2; | 5244 | cy_card[j].base_addr = cy_pci_addr2; |
5251 | cy_card[j].ctl_addr = cy_pci_addr0; | 5245 | cy_card[j].ctl_addr = cy_pci_addr0; |
5252 | cy_card[j].irq = (int)cy_pci_irq; | 5246 | cy_card[j].irq = cy_pci_irq; |
5253 | cy_card[j].bus_index = 1; | 5247 | cy_card[j].bus_index = 1; |
5254 | cy_card[j].first_line = cy_next_channel; | 5248 | cy_card[j].first_line = cy_next_channel; |
5255 | cy_card[j].num_chips = -1; | 5249 | cy_card[j].num_chips = -1; |
@@ -5263,7 +5257,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
5263 | printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, " | 5257 | printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, " |
5264 | "IRQ%d, ", j + 1, (ulong)cy_pci_phys2, | 5258 | "IRQ%d, ", j + 1, (ulong)cy_pci_phys2, |
5265 | (ulong) (cy_pci_phys2 + CyPCI_Zwin - 1), | 5259 | (ulong) (cy_pci_phys2 + CyPCI_Zwin - 1), |
5266 | (int)cy_pci_irq); | 5260 | cy_pci_irq); |
5267 | else | 5261 | else |
5268 | #endif /* CONFIG_CYZ_INTR */ | 5262 | #endif /* CONFIG_CYZ_INTR */ |
5269 | printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, ", | 5263 | printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, ", |