Char: cyclades, create cy_init_Ze

Move Ze init code into new cy_init_Ze, because we will need it in another
place and it will make the code totally unreadable.

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 962a36303d5e90bee80a2b4a073a6ec787e320e0..1430e136d44d2179eabc3fcd39ebd1969ee93ba6 100644 (file)
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -4711,6 +4711,92 @@ static void plx_init(void __iomem * addr, __u32 initctl)
        cy_writel(addr + initctl, readl(addr + initctl) & ~0x20000000);
 }
 
+static int __devinit cy_init_Ze(unsigned long cy_pci_phys0,
+               unsigned long cy_pci_phys2,
+               struct RUNTIME_9060 __iomem *cy_pci_addr0,
+               void __iomem *cy_pci_addr2, int cy_pci_irq,
+               struct pci_dev *pdev)
+{
+       unsigned int j;
+       unsigned short cy_pci_nchan;
+
+       readl(&cy_pci_addr0->mail_box_0);
+#ifdef CY_PCI_DEBUG
+       printk("Cyclades-Z/PCI: relocate winaddr=0x%lx ctladdr=0x%lx\n",
+               (ulong)cy_pci_addr2, (ulong)cy_pci_addr0);
+       printk("Cyclades-Z/PCI: New Cyclades-Z board.  FPGA not "
+                       "loaded\n");
+#endif
+       /* This must be the new Cyclades-Ze/PCI. */
+       cy_pci_nchan = ZE_V1_NPORTS;
+
+       if ((cy_next_channel + cy_pci_nchan) > NR_PORTS) {
+               printk("Cyclades-Ze/PCI found at 0x%lx but no channels "
+                       "are available.\nChange NR_PORTS in cyclades.c "
+                       "and recompile kernel.\n",
+                       (ulong) cy_pci_phys2);
+               return -EIO;
+       }
+
+       /* fill the next cy_card structure available */
+       for (j = 0; j < NR_CARDS; j++) {
+               if (cy_card[j].base_addr == 0)
+                       break;
+       }
+       if (j == NR_CARDS) {    /* no more cy_cards available */
+               printk("Cyclades-Ze/PCI found at 0x%lx but no more "
+                       "cards can be used.\nChange NR_CARDS in "
+                       "cyclades.c and recompile kernel.\n",
+                       (ulong) cy_pci_phys2);
+               return -EIO;
+       }
+#ifdef CONFIG_CYZ_INTR
+       /* allocate IRQ only if board has an IRQ */
+       if ((cy_pci_irq != 0) && (cy_pci_irq != 255)) {
+               if (request_irq(cy_pci_irq, cyz_interrupt,
+                               IRQF_SHARED, "Cyclades-Z",
+                               &cy_card[j])) {
+                       printk("Cyclom-Ze/PCI found at 0x%lx ",
+                               (ulong) cy_pci_phys2);
+                       printk("but could not allocate IRQ%d.\n",
+                               cy_pci_irq);
+                       return -EIO;
+               }
+       }
+#endif                         /* CONFIG_CYZ_INTR */
+
+       /* set cy_card */
+       cy_card[j].base_phys = cy_pci_phys2;
+       cy_card[j].ctl_phys = cy_pci_phys0;
+       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].bus_index = 1;
+       cy_card[j].first_line = cy_next_channel;
+       cy_card[j].num_chips = -1;
+       cy_card[j].pdev = pdev;
+
+       /* print message */
+#ifdef CONFIG_CYZ_INTR
+       /* don't report IRQ if board is no IRQ */
+       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);
+       else
+#endif                         /* CONFIG_CYZ_INTR */
+               printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, ",
+                       j + 1, (ulong) cy_pci_phys2,
+                       (ulong) (cy_pci_phys2 + CyPCI_Ze_win - 1));
+
+       printk("%d channels starting from port %d.\n",
+               cy_pci_nchan, cy_next_channel);
+       cy_next_channel += cy_pci_nchan;
+
+       return 0;
+}
+
 /*
  * ---------------------------------------------------------------------
  * cy_detect_pci() - Test PCI bus presence and Cyclom-Ye/PCI.
@@ -4734,6 +4820,7 @@ static int __init cy_detect_pci(void)
        __u32 Ze_phys0[NR_CARDS], Ze_phys2[NR_CARDS];
        unsigned char Ze_irq[NR_CARDS];
        struct pci_dev *Ze_pdev[NR_CARDS];
+       int retval;
 
        for (i = 0; i < NR_CARDS; i++) {
                /* look for a Cyclades card by vendor and device id */
@@ -5095,80 +5182,10 @@ static int __init cy_detect_pci(void)
                        Ze_pdev[j] = Ze_pdev[j + 1];
                }
                ZeIndex--;
-               mailbox = (__u32)readl(&((struct RUNTIME_9060 __iomem *)
-                                               cy_pci_addr0)->mail_box_0);
-#ifdef CY_PCI_DEBUG
-               printk("Cyclades-Z/PCI: relocate winaddr=0x%lx ctladdr=0x%lx\n",
-                       (ulong)cy_pci_addr2, (ulong)cy_pci_addr0);
-               printk("Cyclades-Z/PCI: New Cyclades-Z board.  FPGA not "
-                               "loaded\n");
-#endif
-               /* This must be the new Cyclades-Ze/PCI. */
-               cy_pci_nchan = ZE_V1_NPORTS;
-
-               if ((cy_next_channel + cy_pci_nchan) > NR_PORTS) {
-                       printk("Cyclades-Ze/PCI found at 0x%lx but no channels "
-                               "are available.\nChange NR_PORTS in cyclades.c "
-                               "and recompile kernel.\n",
-                               (ulong) cy_pci_phys2);
-                       return i;
-               }
-
-               /* fill the next cy_card structure available */
-               for (j = 0; j < NR_CARDS; j++) {
-                       if (cy_card[j].base_addr == 0)
-                               break;
-               }
-               if (j == NR_CARDS) {    /* no more cy_cards available */
-                       printk("Cyclades-Ze/PCI found at 0x%lx but no more "
-                               "cards can be used.\nChange NR_CARDS in "
-                               "cyclades.c and recompile kernel.\n",
-                               (ulong) cy_pci_phys2);
+               retval = cy_init_Ze(cy_pci_phys0, cy_pci_phys2, cy_pci_addr0,
+                                       cy_pci_addr2, cy_pci_irq, pdev);
+               if (retval < 0)
                        return i;
-               }
-#ifdef CONFIG_CYZ_INTR
-               /* allocate IRQ only if board has an IRQ */
-               if ((cy_pci_irq != 0) && (cy_pci_irq != 255)) {
-                       if (request_irq(cy_pci_irq, cyz_interrupt,
-                                       IRQF_SHARED, "Cyclades-Z",
-                                       &cy_card[j])) {
-                               printk("Cyclom-Ze/PCI found at 0x%lx ",
-                                       (ulong) cy_pci_phys2);
-                               printk("but could not allocate IRQ%d.\n",
-                                       cy_pci_irq);
-                               return i;
-                       }
-               }
-#endif                         /* CONFIG_CYZ_INTR */
-
-               /* set cy_card */
-               cy_card[j].base_phys = cy_pci_phys2;
-               cy_card[j].ctl_phys = cy_pci_phys0;
-               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].bus_index = 1;
-               cy_card[j].first_line = cy_next_channel;
-               cy_card[j].num_chips = -1;
-               cy_card[j].pdev = pdev;
-
-               /* print message */
-#ifdef CONFIG_CYZ_INTR
-               /* don't report IRQ if board is no IRQ */
-               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);
-               else
-#endif                         /* CONFIG_CYZ_INTR */
-                       printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, ",
-                               j + 1, (ulong) cy_pci_phys2,
-                               (ulong) (cy_pci_phys2 + CyPCI_Ze_win - 1));
-
-               printk("%d channels starting from port %d.\n",
-                       cy_pci_nchan, cy_next_channel);
-               cy_next_channel += cy_pci_nchan;
        }
        if (ZeIndex != 0) {
                printk("Cyclades-Ze/PCI found at 0x%x but no more cards can be "