diff options
Diffstat (limited to 'drivers/media/video')
32 files changed, 41 insertions, 44 deletions
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index 5c5e682a3004..4861799eb430 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c | |||
@@ -549,7 +549,7 @@ static int ar_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
549 | /* | 549 | /* |
550 | * Interrupt handler | 550 | * Interrupt handler |
551 | */ | 551 | */ |
552 | static void ar_interrupt(int irq, void *dev, struct pt_regs *regs) | 552 | static void ar_interrupt(int irq, void *dev) |
553 | { | 553 | { |
554 | struct ar_device *ar = dev; | 554 | struct ar_device *ar = dev; |
555 | unsigned int line_count; | 555 | unsigned int line_count; |
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 50dde82844ec..6e1ddad9f0c1 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -3753,7 +3753,7 @@ bttv_irq_switch_vbi(struct bttv *btv) | |||
3753 | spin_unlock(&btv->s_lock); | 3753 | spin_unlock(&btv->s_lock); |
3754 | } | 3754 | } |
3755 | 3755 | ||
3756 | static irqreturn_t bttv_irq(int irq, void *dev_id, struct pt_regs * regs) | 3756 | static irqreturn_t bttv_irq(int irq, void *dev_id) |
3757 | { | 3757 | { |
3758 | u32 stat,astat; | 3758 | u32 stat,astat; |
3759 | u32 dstat; | 3759 | u32 dstat; |
diff --git a/drivers/media/video/cpia2/cpia2_usb.c b/drivers/media/video/cpia2/cpia2_usb.c index f4da02941493..28dc6a1a1e43 100644 --- a/drivers/media/video/cpia2/cpia2_usb.c +++ b/drivers/media/video/cpia2/cpia2_usb.c | |||
@@ -49,7 +49,7 @@ static int frame_sizes[] = { | |||
49 | #define FRAME_SIZE_PER_DESC frame_sizes[cam->cur_alt] | 49 | #define FRAME_SIZE_PER_DESC frame_sizes[cam->cur_alt] |
50 | 50 | ||
51 | static void process_frame(struct camera_data *cam); | 51 | static void process_frame(struct camera_data *cam); |
52 | static void cpia2_usb_complete(struct urb *urb, struct pt_regs *); | 52 | static void cpia2_usb_complete(struct urb *urb); |
53 | static int cpia2_usb_probe(struct usb_interface *intf, | 53 | static int cpia2_usb_probe(struct usb_interface *intf, |
54 | const struct usb_device_id *id); | 54 | const struct usb_device_id *id); |
55 | static void cpia2_usb_disconnect(struct usb_interface *intf); | 55 | static void cpia2_usb_disconnect(struct usb_interface *intf); |
@@ -199,7 +199,7 @@ static void add_COM(struct camera_data *cam) | |||
199 | * | 199 | * |
200 | * callback when incoming packet is received | 200 | * callback when incoming packet is received |
201 | *****************************************************************************/ | 201 | *****************************************************************************/ |
202 | static void cpia2_usb_complete(struct urb *urb, struct pt_regs *regs) | 202 | static void cpia2_usb_complete(struct urb *urb) |
203 | { | 203 | { |
204 | int i; | 204 | int i; |
205 | unsigned char *cdata; | 205 | unsigned char *cdata; |
diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c index 2ee34a3b9280..9da4726eb9b9 100644 --- a/drivers/media/video/cpia_usb.c +++ b/drivers/media/video/cpia_usb.c | |||
@@ -109,7 +109,7 @@ static struct cpia_camera_ops cpia_usb_ops = { | |||
109 | static LIST_HEAD(cam_list); | 109 | static LIST_HEAD(cam_list); |
110 | static spinlock_t cam_list_lock_usb; | 110 | static spinlock_t cam_list_lock_usb; |
111 | 111 | ||
112 | static void cpia_usb_complete(struct urb *urb, struct pt_regs *regs) | 112 | static void cpia_usb_complete(struct urb *urb) |
113 | { | 113 | { |
114 | int i; | 114 | int i; |
115 | char *cdata; | 115 | char *cdata; |
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index f0340662e078..e4355fdc3b6d 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c | |||
@@ -262,7 +262,7 @@ static void cx8801_aud_irq(snd_cx88_card_t *chip) | |||
262 | /* | 262 | /* |
263 | * BOARD Specific: Handles IRQ calls | 263 | * BOARD Specific: Handles IRQ calls |
264 | */ | 264 | */ |
265 | static irqreturn_t cx8801_irq(int irq, void *dev_id, struct pt_regs *regs) | 265 | static irqreturn_t cx8801_irq(int irq, void *dev_id) |
266 | { | 266 | { |
267 | snd_cx88_card_t *chip = dev_id; | 267 | snd_cx88_card_t *chip = dev_id; |
268 | struct cx88_core *core = chip->core; | 268 | struct cx88_core *core = chip->core; |
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c index d6d980774c21..6b23a4e6f66d 100644 --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c | |||
@@ -376,7 +376,7 @@ static void cx8802_mpeg_irq(struct cx8802_dev *dev) | |||
376 | 376 | ||
377 | #define MAX_IRQ_LOOP 10 | 377 | #define MAX_IRQ_LOOP 10 |
378 | 378 | ||
379 | static irqreturn_t cx8802_irq(int irq, void *dev_id, struct pt_regs *regs) | 379 | static irqreturn_t cx8802_irq(int irq, void *dev_id) |
380 | { | 380 | { |
381 | struct cx8802_dev *dev = dev_id; | 381 | struct cx8802_dev *dev = dev_id; |
382 | struct cx88_core *core = dev->core; | 382 | struct cx88_core *core = dev->core; |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index cb0c0eea20f9..90e298d074d1 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1744,7 +1744,7 @@ static void cx8800_vid_irq(struct cx8800_dev *dev) | |||
1744 | } | 1744 | } |
1745 | } | 1745 | } |
1746 | 1746 | ||
1747 | static irqreturn_t cx8800_irq(int irq, void *dev_id, struct pt_regs *regs) | 1747 | static irqreturn_t cx8800_irq(int irq, void *dev_id) |
1748 | { | 1748 | { |
1749 | struct cx8800_dev *dev = dev_id; | 1749 | struct cx8800_dev *dev = dev_id; |
1750 | struct cx88_core *core = dev->core; | 1750 | struct cx88_core *core = dev->core; |
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index b9ba95f5e026..b1012e92ee04 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
@@ -166,7 +166,7 @@ static int dabusb_free_buffers (pdabusb_t s) | |||
166 | return 0; | 166 | return 0; |
167 | } | 167 | } |
168 | /*-------------------------------------------------------------------*/ | 168 | /*-------------------------------------------------------------------*/ |
169 | static void dabusb_iso_complete (struct urb *purb, struct pt_regs *regs) | 169 | static void dabusb_iso_complete (struct urb *purb) |
170 | { | 170 | { |
171 | pbuff_t b = purb->context; | 171 | pbuff_t b = purb->context; |
172 | pdabusb_t s = b->s; | 172 | pdabusb_t s = b->s; |
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 4350cc75b025..255a47dfb84f 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
@@ -382,7 +382,7 @@ int em28xx_resolution_set(struct em28xx *dev) | |||
382 | /******************* isoc transfer handling ****************************/ | 382 | /******************* isoc transfer handling ****************************/ |
383 | 383 | ||
384 | #ifdef ENABLE_DEBUG_ISOC_FRAMES | 384 | #ifdef ENABLE_DEBUG_ISOC_FRAMES |
385 | static void em28xx_isoc_dump(struct urb *urb, struct pt_regs *regs) | 385 | static void em28xx_isoc_dump(struct urb *urb) |
386 | { | 386 | { |
387 | int len = 0; | 387 | int len = 0; |
388 | int ntrans = 0; | 388 | int ntrans = 0; |
@@ -534,7 +534,7 @@ static inline void em28xx_isoc_video_copy(struct em28xx *dev, | |||
534 | * em28xx_isoIrq() | 534 | * em28xx_isoIrq() |
535 | * handles the incoming isoc urbs and fills the frames from our inqueue | 535 | * handles the incoming isoc urbs and fills the frames from our inqueue |
536 | */ | 536 | */ |
537 | static void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs) | 537 | static void em28xx_isocIrq(struct urb *urb) |
538 | { | 538 | { |
539 | struct em28xx *dev = urb->context; | 539 | struct em28xx *dev = urb->context; |
540 | int i, status; | 540 | int i, status; |
@@ -545,7 +545,7 @@ static void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs) | |||
545 | return; | 545 | return; |
546 | #ifdef ENABLE_DEBUG_ISOC_FRAMES | 546 | #ifdef ENABLE_DEBUG_ISOC_FRAMES |
547 | if (isoc_debug>1) | 547 | if (isoc_debug>1) |
548 | em28xx_isoc_dump(urb, regs); | 548 | em28xx_isoc_dump(urb); |
549 | #endif | 549 | #endif |
550 | 550 | ||
551 | if (urb->status == -ENOENT) | 551 | if (urb->status == -ENOENT) |
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index 8992b6e62b9f..bc544cc7ccb8 100644 --- a/drivers/media/video/et61x251/et61x251_core.c +++ b/drivers/media/video/et61x251/et61x251_core.c | |||
@@ -398,7 +398,7 @@ int et61x251_i2c_write(struct et61x251_device* cam, u8 address, u8 value) | |||
398 | 398 | ||
399 | /*****************************************************************************/ | 399 | /*****************************************************************************/ |
400 | 400 | ||
401 | static void et61x251_urb_complete(struct urb *urb, struct pt_regs* regs) | 401 | static void et61x251_urb_complete(struct urb *urb) |
402 | { | 402 | { |
403 | struct et61x251_device* cam = urb->context; | 403 | struct et61x251_device* cam = urb->context; |
404 | struct et61x251_frame_t** f; | 404 | struct et61x251_frame_t** f; |
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index e278753f8f25..b083338823df 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -786,7 +786,7 @@ static void mchip_cont_compression_start(void) | |||
786 | /* Interrupt handling */ | 786 | /* Interrupt handling */ |
787 | /****************************************************************************/ | 787 | /****************************************************************************/ |
788 | 788 | ||
789 | static irqreturn_t meye_irq(int irq, void *dev_id, struct pt_regs *regs) | 789 | static irqreturn_t meye_irq(int irq, void *dev_id) |
790 | { | 790 | { |
791 | u32 v; | 791 | u32 v; |
792 | int reqnr; | 792 | int reqnr; |
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c index 5d8cd283fcd8..ce4886f1528d 100644 --- a/drivers/media/video/ov511.c +++ b/drivers/media/video/ov511.c | |||
@@ -3503,7 +3503,7 @@ check_middle: | |||
3503 | } | 3503 | } |
3504 | 3504 | ||
3505 | static void | 3505 | static void |
3506 | ov51x_isoc_irq(struct urb *urb, struct pt_regs *regs) | 3506 | ov51x_isoc_irq(struct urb *urb) |
3507 | { | 3507 | { |
3508 | int i; | 3508 | int i; |
3509 | struct usb_ov511 *ov; | 3509 | struct usb_ov511 *ov; |
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c index 3484e36b6801..368d6e219fa4 100644 --- a/drivers/media/video/planb.c +++ b/drivers/media/video/planb.c | |||
@@ -91,7 +91,7 @@ static void planb_close(struct video_device *); | |||
91 | static int planb_ioctl(struct video_device *, unsigned int, void *); | 91 | static int planb_ioctl(struct video_device *, unsigned int, void *); |
92 | static int planb_init_done(struct video_device *); | 92 | static int planb_init_done(struct video_device *); |
93 | static int planb_mmap(struct video_device *, const char *, unsigned long); | 93 | static int planb_mmap(struct video_device *, const char *, unsigned long); |
94 | static void planb_irq(int, void *, struct pt_regs *); | 94 | static void planb_irq(int, void *); |
95 | static void release_planb(void); | 95 | static void release_planb(void); |
96 | int init_planbs(struct video_init *); | 96 | int init_planbs(struct video_init *); |
97 | 97 | ||
@@ -1316,7 +1316,7 @@ cmd_tab_data_end: | |||
1316 | return c1; | 1316 | return c1; |
1317 | } | 1317 | } |
1318 | 1318 | ||
1319 | static void planb_irq(int irq, void *dev_id, struct pt_regs * regs) | 1319 | static void planb_irq(int irq, void *dev_id) |
1320 | { | 1320 | { |
1321 | unsigned int stat, astat; | 1321 | unsigned int stat, astat; |
1322 | struct planb *pb = (struct planb *)dev_id; | 1322 | struct planb *pb = (struct planb *)dev_id; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 3d8cd0daf6a9..f920e0ccacd3 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
@@ -2552,7 +2552,7 @@ void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *hdw,int v) | |||
2552 | } | 2552 | } |
2553 | 2553 | ||
2554 | 2554 | ||
2555 | static void pvr2_ctl_write_complete(struct urb *urb, struct pt_regs *regs) | 2555 | static void pvr2_ctl_write_complete(struct urb *urb) |
2556 | { | 2556 | { |
2557 | struct pvr2_hdw *hdw = urb->context; | 2557 | struct pvr2_hdw *hdw = urb->context; |
2558 | hdw->ctl_write_pend_flag = 0; | 2558 | hdw->ctl_write_pend_flag = 0; |
@@ -2561,7 +2561,7 @@ static void pvr2_ctl_write_complete(struct urb *urb, struct pt_regs *regs) | |||
2561 | } | 2561 | } |
2562 | 2562 | ||
2563 | 2563 | ||
2564 | static void pvr2_ctl_read_complete(struct urb *urb, struct pt_regs *regs) | 2564 | static void pvr2_ctl_read_complete(struct urb *urb) |
2565 | { | 2565 | { |
2566 | struct pvr2_hdw *hdw = urb->context; | 2566 | struct pvr2_hdw *hdw = urb->context; |
2567 | hdw->ctl_read_pend_flag = 0; | 2567 | hdw->ctl_read_pend_flag = 0; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c index 1e393762546c..70aa63eba0cb 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-io.c +++ b/drivers/media/video/pvrusb2/pvrusb2-io.c | |||
@@ -429,7 +429,7 @@ static void pvr2_stream_done(struct pvr2_stream *sp) | |||
429 | } while (0); mutex_unlock(&sp->mutex); | 429 | } while (0); mutex_unlock(&sp->mutex); |
430 | } | 430 | } |
431 | 431 | ||
432 | static void buffer_complete(struct urb *urb, struct pt_regs *regs) | 432 | static void buffer_complete(struct urb *urb) |
433 | { | 433 | { |
434 | struct pvr2_buffer *bp = urb->context; | 434 | struct pvr2_buffer *bp = urb->context; |
435 | struct pvr2_stream *sp; | 435 | struct pvr2_stream *sp; |
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 53c4b5790d5c..c77b85cf3d80 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
@@ -682,7 +682,7 @@ static int pwc_rcv_short_packet(struct pwc_device *pdev, const struct pwc_frame_ | |||
682 | /* This gets called for the Isochronous pipe (video). This is done in | 682 | /* This gets called for the Isochronous pipe (video). This is done in |
683 | * interrupt time, so it has to be fast, not crash, and not stall. Neat. | 683 | * interrupt time, so it has to be fast, not crash, and not stall. Neat. |
684 | */ | 684 | */ |
685 | static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs) | 685 | static void pwc_isoc_handler(struct urb *urb) |
686 | { | 686 | { |
687 | struct pwc_device *pdev; | 687 | struct pwc_device *pdev; |
688 | int i, fst, flen; | 688 | int i, fst, flen; |
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index a39e0136ce3b..4abf5c03a740 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
@@ -212,7 +212,7 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev, | |||
212 | * | 212 | * |
213 | */ | 213 | */ |
214 | 214 | ||
215 | static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs) | 215 | static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id) |
216 | { | 216 | { |
217 | struct saa7134_dmasound *dmasound = dev_id; | 217 | struct saa7134_dmasound *dmasound = dev_id; |
218 | struct saa7134_dev *dev = dmasound->priv_data; | 218 | struct saa7134_dev *dev = dmasound->priv_data; |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 09aa62f61af7..5c9e63dfbea6 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -495,7 +495,7 @@ static void print_irqstatus(struct saa7134_dev *dev, int loop, | |||
495 | printk("\n"); | 495 | printk("\n"); |
496 | } | 496 | } |
497 | 497 | ||
498 | static irqreturn_t saa7134_irq(int irq, void *dev_id, struct pt_regs *regs) | 498 | static irqreturn_t saa7134_irq(int irq, void *dev_id) |
499 | { | 499 | { |
500 | struct saa7134_dev *dev = (struct saa7134_dev*) dev_id; | 500 | struct saa7134_dev *dev = (struct saa7134_dev*) dev_id; |
501 | unsigned long report,status; | 501 | unsigned long report,status; |
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c index 2e3ba5f31453..bfcb860d14cc 100644 --- a/drivers/media/video/saa7134/saa7134-oss.c +++ b/drivers/media/video/saa7134/saa7134-oss.c | |||
@@ -814,7 +814,7 @@ struct file_operations saa7134_mixer_fops = { | |||
814 | 814 | ||
815 | /* ------------------------------------------------------------------ */ | 815 | /* ------------------------------------------------------------------ */ |
816 | 816 | ||
817 | static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs) | 817 | static irqreturn_t saa7134_oss_irq(int irq, void *dev_id) |
818 | { | 818 | { |
819 | struct saa7134_dmasound *dmasound = dev_id; | 819 | struct saa7134_dmasound *dmasound = dev_id; |
820 | struct saa7134_dev *dev = dmasound->priv_data; | 820 | struct saa7134_dev *dev = dmasound->priv_data; |
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index 67987baee77a..7aeec574d7ce 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c | |||
@@ -282,7 +282,7 @@ static void se401_auto_resetlevel(struct usb_se401 *se401) | |||
282 | } | 282 | } |
283 | 283 | ||
284 | /* irq handler for snapshot button */ | 284 | /* irq handler for snapshot button */ |
285 | static void se401_button_irq(struct urb *urb, struct pt_regs *regs) | 285 | static void se401_button_irq(struct urb *urb) |
286 | { | 286 | { |
287 | struct usb_se401 *se401 = urb->context; | 287 | struct usb_se401 *se401 = urb->context; |
288 | int status; | 288 | int status; |
@@ -318,7 +318,7 @@ exit: | |||
318 | __FUNCTION__, status); | 318 | __FUNCTION__, status); |
319 | } | 319 | } |
320 | 320 | ||
321 | static void se401_video_irq(struct urb *urb, struct pt_regs *regs) | 321 | static void se401_video_irq(struct urb *urb) |
322 | { | 322 | { |
323 | struct usb_se401 *se401 = urb->context; | 323 | struct usb_se401 *se401 = urb->context; |
324 | int length = urb->actual_length; | 324 | int length = urb->actual_length; |
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c index 48d138a7c723..3e0ff8a78468 100644 --- a/drivers/media/video/sn9c102/sn9c102_core.c +++ b/drivers/media/video/sn9c102/sn9c102_core.c | |||
@@ -518,7 +518,7 @@ sn9c102_find_eof_header(struct sn9c102_device* cam, void* mem, size_t len) | |||
518 | } | 518 | } |
519 | 519 | ||
520 | 520 | ||
521 | static void sn9c102_urb_complete(struct urb *urb, struct pt_regs* regs) | 521 | static void sn9c102_urb_complete(struct urb *urb) |
522 | { | 522 | { |
523 | struct sn9c102_device* cam = urb->context; | 523 | struct sn9c102_device* cam = urb->context; |
524 | struct sn9c102_frame_t** f; | 524 | struct sn9c102_frame_t** f; |
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index 5686547ba76a..525d81288d55 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c | |||
@@ -406,7 +406,7 @@ static void send_osd_data(struct saa7146 *saa) | |||
406 | } | 406 | } |
407 | } | 407 | } |
408 | 408 | ||
409 | static irqreturn_t saa7146_irq(int irq, void *dev_id, struct pt_regs *regs) | 409 | static irqreturn_t saa7146_irq(int irq, void *dev_id) |
410 | { | 410 | { |
411 | struct saa7146 *saa = dev_id; | 411 | struct saa7146 *saa = dev_id; |
412 | u32 stat, astat; | 412 | u32 stat, astat; |
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c index 2ba2991a214f..87e11300181d 100644 --- a/drivers/media/video/stv680.c +++ b/drivers/media/video/stv680.c | |||
@@ -582,7 +582,7 @@ static int stv680_set_pict (struct usb_stv *stv680, struct video_picture *p) | |||
582 | return 0; | 582 | return 0; |
583 | } | 583 | } |
584 | 584 | ||
585 | static void stv680_video_irq (struct urb *urb, struct pt_regs *regs) | 585 | static void stv680_video_irq (struct urb *urb) |
586 | { | 586 | { |
587 | struct usb_stv *stv680 = urb->context; | 587 | struct usb_stv *stv680 = urb->context; |
588 | int length = urb->actual_length; | 588 | int length = urb->actual_length; |
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c index 4eee8be88314..abe214619092 100644 --- a/drivers/media/video/usbvideo/konicawc.c +++ b/drivers/media/video/usbvideo/konicawc.c | |||
@@ -387,7 +387,7 @@ static void resubmit_urb(struct uvd *uvd, struct urb *urb) | |||
387 | } | 387 | } |
388 | 388 | ||
389 | 389 | ||
390 | static void konicawc_isoc_irq(struct urb *urb, struct pt_regs *regs) | 390 | static void konicawc_isoc_irq(struct urb *urb) |
391 | { | 391 | { |
392 | struct uvd *uvd = urb->context; | 392 | struct uvd *uvd = urb->context; |
393 | struct konicawc *cam = (struct konicawc *)uvd->user_data; | 393 | struct konicawc *cam = (struct konicawc *)uvd->user_data; |
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c index 56e01b622417..9a26b9484aae 100644 --- a/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/drivers/media/video/usbvideo/quickcam_messenger.c | |||
@@ -125,7 +125,7 @@ static void qcm_report_buttonstat(struct qcm *cam) | |||
125 | } | 125 | } |
126 | } | 126 | } |
127 | 127 | ||
128 | static void qcm_int_irq(struct urb *urb, struct pt_regs *regs) | 128 | static void qcm_int_irq(struct urb *urb) |
129 | { | 129 | { |
130 | int ret; | 130 | int ret; |
131 | struct uvd *uvd = urb->context; | 131 | struct uvd *uvd = urb->context; |
@@ -606,7 +606,7 @@ static void resubmit_urb(struct uvd *uvd, struct urb *urb) | |||
606 | err("usb_submit_urb error (%d)", ret); | 606 | err("usb_submit_urb error (%d)", ret); |
607 | } | 607 | } |
608 | 608 | ||
609 | static void qcm_isoc_irq(struct urb *urb, struct pt_regs *regs) | 609 | static void qcm_isoc_irq(struct urb *urb) |
610 | { | 610 | { |
611 | int len; | 611 | int len; |
612 | struct uvd *uvd = urb->context; | 612 | struct uvd *uvd = urb->context; |
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index 13b37c8c0d56..d8b88024bc2f 100644 --- a/drivers/media/video/usbvideo/usbvideo.c +++ b/drivers/media/video/usbvideo/usbvideo.c | |||
@@ -1680,7 +1680,7 @@ static int usbvideo_CompressIsochronous(struct uvd *uvd, struct urb *urb) | |||
1680 | return totlen; | 1680 | return totlen; |
1681 | } | 1681 | } |
1682 | 1682 | ||
1683 | static void usbvideo_IsocIrq(struct urb *urb, struct pt_regs *regs) | 1683 | static void usbvideo_IsocIrq(struct urb *urb) |
1684 | { | 1684 | { |
1685 | int i, ret, len; | 1685 | int i, ret, len; |
1686 | struct uvd *uvd = urb->context; | 1686 | struct uvd *uvd = urb->context; |
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index d1e04f7c530b..6b6dff4d236a 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -2325,7 +2325,7 @@ static void vino_capture_tasklet(unsigned long channel) { | |||
2325 | } | 2325 | } |
2326 | } | 2326 | } |
2327 | 2327 | ||
2328 | static irqreturn_t vino_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 2328 | static irqreturn_t vino_interrupt(int irq, void *dev_id) |
2329 | { | 2329 | { |
2330 | u32 ctrl, intr; | 2330 | u32 ctrl, intr; |
2331 | unsigned int fc_a, fc_b; | 2331 | unsigned int fc_a, fc_b; |
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c index 2912326a5aef..ddce2fb83424 100644 --- a/drivers/media/video/w9968cf.c +++ b/drivers/media/video/w9968cf.c | |||
@@ -417,7 +417,7 @@ static int w9968cf_write_fsb(struct w9968cf_device*, u16* data); | |||
417 | static int w9968cf_write_sb(struct w9968cf_device*, u16 value); | 417 | static int w9968cf_write_sb(struct w9968cf_device*, u16 value); |
418 | static int w9968cf_read_sb(struct w9968cf_device*); | 418 | static int w9968cf_read_sb(struct w9968cf_device*); |
419 | static int w9968cf_upload_quantizationtables(struct w9968cf_device*); | 419 | static int w9968cf_upload_quantizationtables(struct w9968cf_device*); |
420 | static void w9968cf_urb_complete(struct urb *urb, struct pt_regs *regs); | 420 | static void w9968cf_urb_complete(struct urb *urb); |
421 | 421 | ||
422 | /* Low-level I2C (SMBus) I/O */ | 422 | /* Low-level I2C (SMBus) I/O */ |
423 | static int w9968cf_smbus_start(struct w9968cf_device*); | 423 | static int w9968cf_smbus_start(struct w9968cf_device*); |
@@ -781,7 +781,7 @@ static int w9968cf_allocate_memory(struct w9968cf_device* cam) | |||
781 | If there are no requested frames in the FIFO list, packets are collected into | 781 | If there are no requested frames in the FIFO list, packets are collected into |
782 | a temporary buffer. | 782 | a temporary buffer. |
783 | --------------------------------------------------------------------------*/ | 783 | --------------------------------------------------------------------------*/ |
784 | static void w9968cf_urb_complete(struct urb *urb, struct pt_regs *regs) | 784 | static void w9968cf_urb_complete(struct urb *urb) |
785 | { | 785 | { |
786 | struct w9968cf_device* cam = (struct w9968cf_device*)urb->context; | 786 | struct w9968cf_device* cam = (struct w9968cf_device*)urb->context; |
787 | struct w9968cf_frame_t** f; | 787 | struct w9968cf_frame_t** f; |
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c index 1b2be2d2a3ec..5b5563424422 100644 --- a/drivers/media/video/zc0301/zc0301_core.c +++ b/drivers/media/video/zc0301/zc0301_core.c | |||
@@ -303,7 +303,7 @@ int zc0301_i2c_write(struct zc0301_device* cam, u16 address, u16 value) | |||
303 | 303 | ||
304 | /*****************************************************************************/ | 304 | /*****************************************************************************/ |
305 | 305 | ||
306 | static void zc0301_urb_complete(struct urb *urb, struct pt_regs* regs) | 306 | static void zc0301_urb_complete(struct urb *urb) |
307 | { | 307 | { |
308 | struct zc0301_device* cam = urb->context; | 308 | struct zc0301_device* cam = urb->context; |
309 | struct zc0301_frame_t** f; | 309 | struct zc0301_frame_t** f; |
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c index 3cbac2e8aed3..d9d5020a2224 100644 --- a/drivers/media/video/zoran_device.c +++ b/drivers/media/video/zoran_device.c | |||
@@ -1408,8 +1408,7 @@ error_handler (struct zoran *zr, | |||
1408 | 1408 | ||
1409 | irqreturn_t | 1409 | irqreturn_t |
1410 | zoran_irq (int irq, | 1410 | zoran_irq (int irq, |
1411 | void *dev_id, | 1411 | void *dev_id) |
1412 | struct pt_regs *regs) | ||
1413 | { | 1412 | { |
1414 | u32 stat, astat; | 1413 | u32 stat, astat; |
1415 | int count; | 1414 | int count; |
diff --git a/drivers/media/video/zoran_device.h b/drivers/media/video/zoran_device.h index f19705cbdb39..37fa86a34083 100644 --- a/drivers/media/video/zoran_device.h +++ b/drivers/media/video/zoran_device.h | |||
@@ -64,9 +64,7 @@ extern int wait_grab_pending(struct zoran *zr); | |||
64 | /* interrupts */ | 64 | /* interrupts */ |
65 | extern void print_interrupts(struct zoran *zr); | 65 | extern void print_interrupts(struct zoran *zr); |
66 | extern void clear_interrupt_counters(struct zoran *zr); | 66 | extern void clear_interrupt_counters(struct zoran *zr); |
67 | extern irqreturn_t zoran_irq(int irq, | 67 | extern irqreturn_t zoran_irq(int irq, void *dev_id); |
68 | void *dev_id, | ||
69 | struct pt_regs *regs); | ||
70 | 68 | ||
71 | /* JPEG codec access */ | 69 | /* JPEG codec access */ |
72 | extern void jpeg_start(struct zoran *zr); | 70 | extern void jpeg_start(struct zoran *zr); |
diff --git a/drivers/media/video/zr36120.c b/drivers/media/video/zr36120.c index b5ffe53c40d8..0cbf564388a6 100644 --- a/drivers/media/video/zr36120.c +++ b/drivers/media/video/zr36120.c | |||
@@ -335,13 +335,13 @@ DEBUG(printk(CARD_DEBUG "turning off\n",CARD)); | |||
335 | } | 335 | } |
336 | 336 | ||
337 | static | 337 | static |
338 | void zoran_irq(int irq, void *dev_id, struct pt_regs * regs) | 338 | void zoran_irq(int irq, void *dev_id) |
339 | { | 339 | { |
340 | u32 stat,estat; | 340 | u32 stat,estat; |
341 | int count = 0; | 341 | int count = 0; |
342 | struct zoran *ztv = dev_id; | 342 | struct zoran *ztv = dev_id; |
343 | 343 | ||
344 | UNUSED(irq); UNUSED(regs); | 344 | UNUSED(irq); |
345 | for (;;) { | 345 | for (;;) { |
346 | /* get/clear interrupt status bits */ | 346 | /* get/clear interrupt status bits */ |
347 | stat=zrread(ZORAN_ISR); | 347 | stat=zrread(ZORAN_ISR); |