aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac/via.c
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2011-10-23 10:11:22 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-12-10 13:52:48 -0500
commit608e287b0591789ecd851b05db6f0ba37807fadc (patch)
treea916cd0df9c240655e0ac1f6f99787167c57deab /arch/m68k/mac/via.c
parentaa8a9fbe18bbbcf25bf5e3c7155e886057dcf171 (diff)
m68k/mac: cleanup macro case
Code style convention has macro names in uppercase. Change MAC_VIA_IIci to MAC_VIA_IICI. Also remove an obsolete comment. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac/via.c')
-rw-r--r--arch/m68k/mac/via.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 7a2993bb092d..2d85662715fb 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -126,7 +126,7 @@ void __init via_init(void)
126 126
127 /* IIci, IIsi, IIvx, IIvi (P6xx), LC series */ 127 /* IIci, IIsi, IIvx, IIvi (P6xx), LC series */
128 128
129 case MAC_VIA_IIci: 129 case MAC_VIA_IICI:
130 via1 = (void *) VIA1_BASE; 130 via1 = (void *) VIA1_BASE;
131 if (macintosh_config->ident == MAC_MODEL_IIFX) { 131 if (macintosh_config->ident == MAC_MODEL_IIFX) {
132 via2 = NULL; 132 via2 = NULL;
@@ -399,7 +399,7 @@ void __init via_nubus_init(void)
399 case MAC_VIA_QUADRA: 399 case MAC_VIA_QUADRA:
400 pr_debug("VIA2 vDirA is 0x%02X\n", via2[vDirA]); 400 pr_debug("VIA2 vDirA is 0x%02X\n", via2[vDirA]);
401 break; 401 break;
402 case MAC_VIA_IIci: 402 case MAC_VIA_IICI:
403 /* RBV. Disable all the slot interrupts. SIER works like IER. */ 403 /* RBV. Disable all the slot interrupts. SIER works like IER. */
404 via2[rSIER] = 0x7F; 404 via2[rSIER] = 0x7F;
405 break; 405 break;
@@ -422,7 +422,7 @@ void via_nubus_irq_startup(int irq)
422 via2[vDirA] &= 0x80 | ~(1 << irq_idx); 422 via2[vDirA] &= 0x80 | ~(1 << irq_idx);
423 } 423 }
424 /* fall through */ 424 /* fall through */
425 case MAC_VIA_IIci: 425 case MAC_VIA_IICI:
426 via_irq_enable(irq); 426 via_irq_enable(irq);
427 break; 427 break;
428 } 428 }
@@ -436,7 +436,7 @@ void via_nubus_irq_shutdown(int irq)
436 /* Ensure that the umbrella CA1 interrupt remains enabled. */ 436 /* Ensure that the umbrella CA1 interrupt remains enabled. */
437 via_irq_enable(irq); 437 via_irq_enable(irq);
438 break; 438 break;
439 case MAC_VIA_IIci: 439 case MAC_VIA_IICI:
440 via_irq_disable(irq); 440 via_irq_disable(irq);
441 break; 441 break;
442 } 442 }
@@ -569,7 +569,7 @@ void via_irq_enable(int irq) {
569 if (!nubus_disabled) 569 if (!nubus_disabled)
570 via2[gIER] = IER_SET_BIT(1); 570 via2[gIER] = IER_SET_BIT(1);
571 break; 571 break;
572 case MAC_VIA_IIci: 572 case MAC_VIA_IICI:
573 /* On RBV, enable the slot interrupt. 573 /* On RBV, enable the slot interrupt.
574 * SIER works like IER. 574 * SIER works like IER.
575 */ 575 */
@@ -599,7 +599,7 @@ void via_irq_disable(int irq) {
599 if (nubus_disabled) 599 if (nubus_disabled)
600 via2[gIER] = IER_CLR_BIT(1); 600 via2[gIER] = IER_CLR_BIT(1);
601 break; 601 break;
602 case MAC_VIA_IIci: 602 case MAC_VIA_IICI:
603 via2[rSIER] = IER_CLR_BIT(irq_idx); 603 via2[rSIER] = IER_CLR_BIT(irq_idx);
604 break; 604 break;
605 } 605 }