]> err.no Git - linux-2.6/commitdiff
Char: cyclades, remove PAUSE
authorJiri Slaby <jirislaby@gmail.com>
Tue, 8 May 2007 07:35:43 +0000 (00:35 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 18:15:22 +0000 (11:15 -0700)
cyclades, remove PAUSE

PAUSE expands to do {} while (0), it's useless.

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>
drivers/char/cyclades.c

index ff63ee1d6065fdb32abd686849f4d5cf7b1f7cac..3b62962b35128f1c864756f5dd92282b25debd44 100644 (file)
 #undef CY_ENABLE_MONITORING
 #undef CY_PCI_DEBUG
 
-#if 0
-#define PAUSE __asm__("nop")
-#else
-#define PAUSE do {} while (0)
-#endif
-
 /*
  * Include section 
  */
@@ -5009,7 +5003,6 @@ static int __init cy_detect_pci(void)
                                cy_writel(&((struct RUNTIME_9060 *)
                                        (cy_pci_addr0))->loc_addr_base,
                                        WIN_CREG);
-                               PAUSE;
                                printk("Cyclades-8Zo/PCI: FPGA id %lx, ver "
                                        "%lx\n", (ulong) (0xff &
                                        cy_readl(&((struct CUSTOM_REG *)
@@ -5030,7 +5023,6 @@ static int __init cy_detect_pci(void)
                           ensures that the driver will not attempt to talk to
                           the board until it has been properly initialized.
                         */
-                       PAUSE;
                        if ((mailbox == ZO_V1) || (mailbox == ZO_V2))
                                cy_writel(cy_pci_addr2 + ID_ADDRESS, 0L);
 
@@ -5129,7 +5121,6 @@ static int __init cy_detect_pci(void)
                printk("Cyclades-Z/PCI: New Cyclades-Z board.  FPGA not "
                                "loaded\n");
 #endif
-               PAUSE;
                /* This must be the new Cyclades-Ze/PCI. */
                cy_pci_nchan = ZE_V1_NPORTS;