aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-05-08 00:35:43 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 11:15:22 -0700
commitffa68e79ffa952ec909b66505f004e7323316369 (patch)
tree8b53be40cf341567c44fb605ed81a24510e7954c
parentb30fabadae2b3c1a65e3662be98f105d5718db70 (diff)
downloadkernel_samsung_smdk4412-ffa68e79ffa952ec909b66505f004e7323316369.zip
kernel_samsung_smdk4412-ffa68e79ffa952ec909b66505f004e7323316369.tar.gz
kernel_samsung_smdk4412-ffa68e79ffa952ec909b66505f004e7323316369.tar.bz2
Char: cyclades, remove PAUSE
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>
-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 ff63ee1..3b62962 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -624,12 +624,6 @@
#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;