[PATCH] misc arm pt_regs fixes

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 3641f3b4a2ccbc50657b3dd11b4cc0d3cf410d5f..615d2b14efa71bbb5f5ff0de37d97afd74451e4c 100644 (file)
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -346,7 +346,7 @@ static void dm9000_timeout(struct net_device *dev)
 static void dm9000_poll_controller(struct net_device *dev)
 {
        disable_irq(dev->irq);
-       dm9000_interrupt(dev->irq,dev,NULL);
+       dm9000_interrupt(dev->irq,dev);
        enable_irq(dev->irq);
 }
 #endif

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 4d2946e540cf9462538db8b51274fd5a40621ffe..f1f32d7be5f929d022660952c18d8e11b202e4dd 100644 (file)
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -1551,7 +1551,7 @@ return_urb:
                        ep->already_seen = ep->setup_stage = 0;
 
                spin_unlock (&dum->lock);
-               usb_hcd_giveback_urb (dummy_to_hcd(dum), urb, NULL);
+               usb_hcd_giveback_urb (dummy_to_hcd(dum), urb);
                spin_lock (&dum->lock);
 
                goto restart;

diff --git a/include/asm-arm/hw_irq.h b/include/asm-arm/hw_irq.h
index ea856971989a261e3127678ce0d5d06bd68a5795..98d594a973d6c821d5314afb6c13c08d22871fd1 100644 (file)
--- a/include/asm-arm/hw_irq.h
+++ b/include/asm-arm/hw_irq.h
@@ -12,7 +12,7 @@
        if (!(action->flags & IRQF_TIMER) && system_timer->dyn_tick) {  \
                write_seqlock(&xtime_lock);                             \
                if (system_timer->dyn_tick->state & DYN_TICK_ENABLED)   \
-                       system_timer->dyn_tick->handler(irq, 0, regs);  \
+                       system_timer->dyn_tick->handler(irq, NULL);     \
                write_sequnlock(&xtime_lock);                           \
        }
 #endif

diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index 8932d89408efb294d2673d7da8f25625cd154046..bb4a0969f4616602c8c583844c35585a77325903 100644 (file)
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -372,7 +372,7 @@ static void vidc_audio_trigger(int dev, int enable_bits)
                        adev->flags |= DMA_ACTIVE;
 
                        dma_interrupt = vidc_audio_dma_interrupt;
-                       vidc_sound_dma_irq(0, NULL, NULL);
+                       vidc_sound_dma_irq(0, NULL);
                        iomd_writeb(DMA_CR_E | 0x10, IOMD_SD0CR);
 
                        local_irq_restore(flags);