diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /sound/usb/usbaudio.c | |
parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'sound/usb/usbaudio.c')
-rw-r--r-- | sound/usb/usbaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index a42acf6d7b68..c82b01c7ad3a 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -653,7 +653,7 @@ static struct snd_urb_ops audio_urb_ops_high_speed[2] = { | |||
653 | /* | 653 | /* |
654 | * complete callback from data urb | 654 | * complete callback from data urb |
655 | */ | 655 | */ |
656 | static void snd_complete_urb(struct urb *urb, struct pt_regs *regs) | 656 | static void snd_complete_urb(struct urb *urb) |
657 | { | 657 | { |
658 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 658 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; |
659 | struct snd_usb_substream *subs = ctx->subs; | 659 | struct snd_usb_substream *subs = ctx->subs; |
@@ -676,7 +676,7 @@ static void snd_complete_urb(struct urb *urb, struct pt_regs *regs) | |||
676 | /* | 676 | /* |
677 | * complete callback from sync urb | 677 | * complete callback from sync urb |
678 | */ | 678 | */ |
679 | static void snd_complete_sync_urb(struct urb *urb, struct pt_regs *regs) | 679 | static void snd_complete_sync_urb(struct urb *urb) |
680 | { | 680 | { |
681 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 681 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; |
682 | struct snd_usb_substream *subs = ctx->subs; | 682 | struct snd_usb_substream *subs = ctx->subs; |