diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2007-05-08 03:35:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:22 -0400 |
commit | ffa68e79ffa952ec909b66505f004e7323316369 (patch) | |
tree | 8b53be40cf341567c44fb605ed81a24510e7954c /drivers/char/cyclades.c | |
parent | b30fabadae2b3c1a65e3662be98f105d5718db70 (diff) |
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>
Diffstat (limited to 'drivers/char/cyclades.c')
-rw-r--r-- | drivers/char/cyclades.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index ff63ee1d6065..3b62962b3512 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
@@ -624,12 +624,6 @@ | |||
624 | #undef CY_ENABLE_MONITORING | 624 | #undef CY_ENABLE_MONITORING |
625 | #undef CY_PCI_DEBUG | 625 | #undef CY_PCI_DEBUG |
626 | 626 | ||
627 | #if 0 | ||
628 | #define PAUSE __asm__("nop") | ||
629 | #else | ||
630 | #define PAUSE do {} while (0) | ||
631 | #endif | ||
632 | |||
633 | /* | 627 | /* |
634 | * Include section | 628 | * Include section |
635 | */ | 629 | */ |
@@ -5009,7 +5003,6 @@ static int __init cy_detect_pci(void) | |||
5009 | cy_writel(&((struct RUNTIME_9060 *) | 5003 | cy_writel(&((struct RUNTIME_9060 *) |
5010 | (cy_pci_addr0))->loc_addr_base, | 5004 | (cy_pci_addr0))->loc_addr_base, |
5011 | WIN_CREG); | 5005 | WIN_CREG); |
5012 | PAUSE; | ||
5013 | printk("Cyclades-8Zo/PCI: FPGA id %lx, ver " | 5006 | printk("Cyclades-8Zo/PCI: FPGA id %lx, ver " |
5014 | "%lx\n", (ulong) (0xff & | 5007 | "%lx\n", (ulong) (0xff & |
5015 | cy_readl(&((struct CUSTOM_REG *) | 5008 | cy_readl(&((struct CUSTOM_REG *) |
@@ -5030,7 +5023,6 @@ static int __init cy_detect_pci(void) | |||
5030 | ensures that the driver will not attempt to talk to | 5023 | ensures that the driver will not attempt to talk to |
5031 | the board until it has been properly initialized. | 5024 | the board until it has been properly initialized. |
5032 | */ | 5025 | */ |
5033 | PAUSE; | ||
5034 | if ((mailbox == ZO_V1) || (mailbox == ZO_V2)) | 5026 | if ((mailbox == ZO_V1) || (mailbox == ZO_V2)) |
5035 | cy_writel(cy_pci_addr2 + ID_ADDRESS, 0L); | 5027 | cy_writel(cy_pci_addr2 + ID_ADDRESS, 0L); |
5036 | 5028 | ||
@@ -5129,7 +5121,6 @@ static int __init cy_detect_pci(void) | |||
5129 | printk("Cyclades-Z/PCI: New Cyclades-Z board. FPGA not " | 5121 | printk("Cyclades-Z/PCI: New Cyclades-Z board. FPGA not " |
5130 | "loaded\n"); | 5122 | "loaded\n"); |
5131 | #endif | 5123 | #endif |
5132 | PAUSE; | ||
5133 | /* This must be the new Cyclades-Ze/PCI. */ | 5124 | /* This must be the new Cyclades-Ze/PCI. */ |
5134 | cy_pci_nchan = ZE_V1_NPORTS; | 5125 | cy_pci_nchan = ZE_V1_NPORTS; |
5135 | 5126 | ||