X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fm68k%2Fq40%2Fq40ints.c;h=54189735145f8817120bf4baf8b38eaedc1a1ea9;hb=4e4f43fe003969bdaa246374b90e16708a22ef79;hp=8cafcb91ca6a73adc047bc6a61d89a06b91c5ff1;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git

diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index 8cafcb91c..541897351 100644
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -30,14 +30,14 @@
 #include <asm/q40_master.h>
 #include <asm/q40ints.h>
 
-/* 
- * Q40 IRQs are defined as follows: 
+/*
+ * Q40 IRQs are defined as follows:
  *            3,4,5,6,7,10,11,14,15 : ISA dev IRQs
  *            16-31: reserved
  *            32   : keyboard int
  *            33   : frame int (50/200 Hz periodic timer)
  *            34   : sample int (10/20 KHz periodic timer)
- *          
+ *
 */
 
 extern int ints_inited;
@@ -122,7 +122,7 @@ int q40_request_irq(unsigned int irq,
 	  case 12: case 13:
 	    printk("%s: ISA IRQ %d from %s not implemented by HW\n", __FUNCTION__, irq, devname);
 	    return -ENXIO;
-	  case 11: 	      
+	  case 11:
 	    printk("warning IRQ 10 and 11 not distinguishable\n");
 	    irq=10;
 	  default:
@@ -131,7 +131,7 @@ int q40_request_irq(unsigned int irq,
 
 	if (irq<Q40_IRQ_SAMPLE)
 	  {
-	    if (irq_tab[irq].dev_id != NULL) 
+	    if (irq_tab[irq].dev_id != NULL)
 		  {
 		    printk("%s: IRQ %d from %s is not replaceable\n",
 			   __FUNCTION__, irq, irq_tab[irq].devname);
@@ -176,13 +176,13 @@ void q40_free_irq(unsigned int irq, void *dev_id)
 	  default:
 	    ;
 	  }
-	
+
 	if (irq<Q40_IRQ_SAMPLE)
 	  {
 	    if (irq_tab[irq].dev_id != dev_id)
 	      printk("%s: Removing probably wrong IRQ %d from %s\n",
 		     __FUNCTION__, irq, irq_tab[irq].devname);
-	    
+
 	    irq_tab[irq].handler = q40_defhand;
 	    irq_tab[irq].flags   = 0;
 	    irq_tab[irq].dev_id  = NULL;
@@ -205,7 +205,7 @@ irqreturn_t q40_process_int (int level, struct pt_regs *fp)
   return IRQ_HANDLED;
 }
 
-/* 
+/*
  * this stuff doesn't really belong here..
 */
 
@@ -267,10 +267,10 @@ void q40_sched_init (irqreturn_t (*timer_routine)(int, void *, struct pt_regs *)
 }
 
 
-/* 
- * tables to translate bits into IRQ numbers 
+/*
+ * tables to translate bits into IRQ numbers
  * it is a good idea to order the entries by priority
- * 
+ *
 */
 
 struct IRQ_TABLE{ unsigned mask; int irq ;};
@@ -319,7 +319,7 @@ irqreturn_t q40_irq2_handler (int vec, void *devname, struct pt_regs *fp)
   mir=master_inb(IIRQ_REG);
   if (mir&Q40_IRQ_FRAME_MASK) {
 	  irq_tab[Q40_IRQ_FRAME].count++;
-	  irq_tab[Q40_IRQ_FRAME].handler(Q40_IRQ_FRAME,irq_tab[Q40_IRQ_FRAME].dev_id,fp);   
+	  irq_tab[Q40_IRQ_FRAME].handler(Q40_IRQ_FRAME,irq_tab[Q40_IRQ_FRAME].dev_id,fp);
 	  master_outb(-1,FRAME_CLEAR_REG);
   }
   if ((mir&Q40_IRQ_SER_MASK) || (mir&Q40_IRQ_EXT_MASK)) {
@@ -356,15 +356,15 @@ irqreturn_t q40_irq2_handler (int vec, void *devname, struct pt_regs *fp)
 #endif
 				  goto iirq;
 			  }
-			  irq_tab[irq].count++; 
+			  irq_tab[irq].count++;
 			  irq_tab[irq].state |= IRQ_INPROGRESS;
 			  irq_tab[irq].handler(irq,irq_tab[irq].dev_id,fp);
 			  irq_tab[irq].state &= ~IRQ_INPROGRESS;
-			  
+
 			  /* naively enable everything, if that fails than    */
 			  /* this function will be reentered immediately thus */
 			  /* getting another chance to disable the IRQ        */
-			  
+
 			  if ( disabled ) {
 #ifdef IP_USE_DISABLE
 				  if (irq>4){
@@ -379,9 +379,9 @@ irqreturn_t q40_irq2_handler (int vec, void *devname, struct pt_regs *fp)
 			  return IRQ_HANDLED;
 		  }
 	  }
-	  if (mer && ccleirq>0 && !aliased_irq) 
+	  if (mer && ccleirq>0 && !aliased_irq)
 		  printk("ISA interrupt from unknown source? EIRQ_REG = %x\n",mer),ccleirq--;
-  } 
+  }
  iirq:
   mir=master_inb(IIRQ_REG);
   /* should test whether keyboard irq is really enabled, doing it in defhand */
@@ -399,10 +399,10 @@ int show_q40_interrupts (struct seq_file *p, void *v)
 	for (i = 0; i <= Q40_IRQ_MAX; i++) {
 		if (irq_tab[i].count)
 		      seq_printf(p, "%sIRQ %02d: %8d  %s%s\n",
-			      (i<=15) ? "ISA-" : "    " ,		
+			      (i<=15) ? "ISA-" : "    " ,
 			    i, irq_tab[i].count,
 			    irq_tab[i].devname[0] ? irq_tab[i].devname : "?",
-			    irq_tab[i].handler == q40_defhand ? 
+			    irq_tab[i].handler == q40_defhand ?
 					" (now unassigned)" : "");
 	}
 	return 0;
@@ -440,7 +440,7 @@ void q40_enable_irq (unsigned int irq)
   {
     mext_disabled--;
     if (mext_disabled>0)
-	  printk("q40_enable_irq : nested disable/enable\n"); 
+	  printk("q40_enable_irq : nested disable/enable\n");
     if (mext_disabled==0)
     master_outb(1,EXT_ENABLE_REG);
     }