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,
         /* set cy_card */
         cy_card[j].base_addr = cy_pci_addr2;
         cy_card[j].ctl_addr = cy_pci_addr0;
-        cy_card[j].irq = (int)cy_pci_irq;
+        cy_card[j].irq = cy_pci_irq;
         cy_card[j].bus_index = 1;
         cy_card[j].first_line = cy_next_channel;
         cy_card[j].num_chips = -1;
@@ -4929,8 +4929,7 @@ static int __devinit cy_init_Ze(unsigned long cy_pci_phys0,
         if ((cy_pci_irq != 0) && (cy_pci_irq != 255))
                 printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, IRQ%d, ",
                         j + 1, (ulong) cy_pci_phys2,
-                        (ulong) (cy_pci_phys2 + CyPCI_Ze_win - 1),
-                        (int)cy_pci_irq);
+                        (ulong) (cy_pci_phys2 + CyPCI_Ze_win - 1), cy_pci_irq);
         else
 #endif                          /* CONFIG_CYZ_INTR */
                 printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, ",
@@ -4950,7 +4949,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent)
 {
         unsigned char cyy_rev_id;
-        unsigned char cy_pci_irq;
+        int cy_pci_irq;
         __u32 cy_pci_phys0, cy_pci_phys2, mailbox;
         void __iomem *cy_pci_addr0, *cy_pci_addr2;
         unsigned int device_id;
@@ -4976,8 +4975,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
 #ifdef CY_PCI_DEBUG
                 printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ",
                         pdev->bus->number, pdev->devfn);
-                printk("rev_id=%d) IRQ%d\n",
-                        cyy_rev_id, (int)cy_pci_irq);
+                printk("rev_id=%d) IRQ%d\n", cyy_rev_id, cy_pci_irq);
                 printk("Cyclom-Y/PCI:found  winaddr=0x%lx "
                         "ctladdr=0x%lx\n",
                         (ulong)cy_pci_phys2, (ulong)cy_pci_phys0);
@@ -5003,7 +5001,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                         printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ",
                                 pdev->bus->number, pdev->devfn);
                         printk("rev_id=%d) IRQ%d\n",
-                                cyy_rev_id, (int)cy_pci_irq);
+                                cyy_rev_id, cy_pci_irq);
                         printk("Cyclom-Y/PCI:found  winaddr=0x%lx "
                                 "ctladdr=0x%lx\n",
                                 (ulong)cy_pci_phys2,
@@ -5065,7 +5063,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                 /* set cy_card */
                 cy_card[j].base_addr = cy_pci_addr2;
                 cy_card[j].ctl_addr = cy_pci_addr0;
-                cy_card[j].irq = (int)cy_pci_irq;
+                cy_card[j].irq = cy_pci_irq;
                 cy_card[j].bus_index = 1;
                 cy_card[j].first_line = cy_next_channel;
                 cy_card[j].num_chips = cy_pci_nchan / 4;
@@ -5101,8 +5099,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                 /* print message */
                 printk("Cyclom-Y/PCI #%d: 0x%lx-0x%lx, IRQ%d, ",
                         j + 1, (ulong)cy_pci_phys2,
-                        (ulong) (cy_pci_phys2 + CyPCI_Ywin - 1),
-                        (int)cy_pci_irq);
+                        (ulong) (cy_pci_phys2 + CyPCI_Ywin - 1), cy_pci_irq);
                 printk("%d channels starting from port %d.\n",
                         cy_pci_nchan, cy_next_channel);
                 for (j = cy_next_channel;
@@ -5114,8 +5111,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                 /* print message */
                 printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ",
                         pdev->bus->number, pdev->devfn);
-                printk("rev_id=%d) IRQ%d\n",
-                        cyy_rev_id, (int)cy_pci_irq);
+                printk("rev_id=%d) IRQ%d\n", cyy_rev_id, cy_pci_irq);
                 printk("Cyclades-Z/PCI: found winaddr=0x%lx "
                         "ctladdr=0x%lx\n",
                         (ulong)cy_pci_phys2, (ulong)cy_pci_phys0);
@@ -5126,8 +5122,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
 #ifdef CY_PCI_DEBUG
                 printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ",
                         pdev->bus->number, pdev->devfn);
-                printk("rev_id=%d) IRQ%d\n",
-                        cyy_rev_id, (int)cy_pci_irq);
+                printk("rev_id=%d) IRQ%d\n", cyy_rev_id, cy_pci_irq);
                 printk("Cyclades-Z/PCI: found winaddr=0x%lx "
                         "ctladdr=0x%lx\n",
                         (ulong) cy_pci_phys2, (ulong) cy_pci_phys0);
@@ -5144,8 +5139,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                    re-write it to the PCI config. registers.
                    This will remain here until we find a permanent
                    fix. */
-                pci_write_config_byte(pdev, PCI_INTERRUPT_LINE,
-                                        cy_pci_irq);
+                pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, cy_pci_irq);
 
                 mailbox = (__u32)readl(&((struct RUNTIME_9060 __iomem *)
                                 cy_pci_addr0)->mail_box_0);
@@ -5249,7 +5243,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                 /* set cy_card */
                 cy_card[j].base_addr = cy_pci_addr2;
                 cy_card[j].ctl_addr = cy_pci_addr0;
-                cy_card[j].irq = (int)cy_pci_irq;
+                cy_card[j].irq = cy_pci_irq;
                 cy_card[j].bus_index = 1;
                 cy_card[j].first_line = cy_next_channel;
                 cy_card[j].num_chips = -1;
@@ -5263,7 +5257,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                         printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, "
                                 "IRQ%d, ", j + 1, (ulong)cy_pci_phys2,
                                 (ulong) (cy_pci_phys2 + CyPCI_Zwin - 1),
-                                (int)cy_pci_irq);
+                                cy_pci_irq);
                 else
 #endif                          /* CONFIG_CYZ_INTR */
                         printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, ",