Changeset 6cd9aa6 in mainline for kernel/arch/ia64/src

Timestamp:

2009-02-15T23:13:55Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

17f168e

Parents:

fa09449

Message:

IRQ handlers are using one superfluous argument and an unused elipsis.
On the other hand, IRQ claim functions would need to be passed the instance
argument.

Location:

kernel/arch/ia64/src

Files:

• drivers/it.c (modified) (3 diffs)
• interrupt.c (modified) (2 diffs)
• ski/ski.c (modified) (1 diff)

kernel/arch/ia64/src/drivers/it.c

@@ -57 +57 @@
 static irq_t it_irq;
 
-static irq_ownership_t it_claim(void);
-static void it_interrupt(irq_t *irq, void *arg, ...);
+static irq_ownership_t it_claim(void *);
+static void it_interrupt(irq_t *irq);
 
 /** Initialize Interval Timer. */
@@ -105 +105 @@
  * @return Always IRQ_ACCEPT.
  */
-irq_ownership_t it_claim(void)
+irq_ownership_t it_claim(void *instance)
 {
         return IRQ_ACCEPT;
@@ -111 +111 @@
 
 /** Process Interval Timer interrupt. */
-void it_interrupt(irq_t *irq, void *arg, ...)
+void it_interrupt(irq_t *irq)
 {
         int64_t c;

kernel/arch/ia64/src/interrupt.c

@@ -267 +267 @@
                 irq = irq_dispatch_and_lock(ivr.vector);
                 if (irq) {
-                        irq->handler(irq, irq->arg);
+                        irq->handler(irq);
                         spinlock_unlock(&irq->lock);
                 } else {
@@ -284 +284 @@
                                 end_of_local_irq();
                         }
-                        irq->handler(irq, irq->arg);
+                        irq->handler(irq);
                         if (!irq->preack)
                                 end_of_local_irq();

kernel/arch/ia64/src/ski/ski.c

@@ -187 +187 @@
  * @return Always IRQ_DECLINE.
  */
-static irq_ownership_t ski_kbd_claim(void)
+static irq_ownership_t ski_kbd_claim(void *instance)
 {
         return IRQ_DECLINE;