diff options
Diffstat (limited to 'sound/usb/usx2y')
| -rw-r--r-- | sound/usb/usx2y/usbusx2y.c | 4 | ||||
| -rw-r--r-- | sound/usb/usx2y/usbusx2yaudio.c | 10 | ||||
| -rw-r--r-- | sound/usb/usx2y/usx2yhwdeppcm.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c index cfec38d7839b..e011fcacce92 100644 --- a/sound/usb/usx2y/usbusx2y.c +++ b/sound/usb/usx2y/usbusx2y.c | |||
| @@ -172,7 +172,7 @@ static void snd_usX2Y_card_private_free(struct snd_card *card); | |||
| 172 | /* | 172 | /* |
| 173 | * pipe 4 is used for switching the lamps, setting samplerate, volumes .... | 173 | * pipe 4 is used for switching the lamps, setting samplerate, volumes .... |
| 174 | */ | 174 | */ |
| 175 | static void i_usX2Y_Out04Int(struct urb *urb, struct pt_regs *regs) | 175 | static void i_usX2Y_Out04Int(struct urb *urb) |
| 176 | { | 176 | { |
| 177 | #ifdef CONFIG_SND_DEBUG | 177 | #ifdef CONFIG_SND_DEBUG |
| 178 | if (urb->status) { | 178 | if (urb->status) { |
| @@ -184,7 +184,7 @@ static void i_usX2Y_Out04Int(struct urb *urb, struct pt_regs *regs) | |||
| 184 | #endif | 184 | #endif |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | static void i_usX2Y_In04Int(struct urb *urb, struct pt_regs *regs) | 187 | static void i_usX2Y_In04Int(struct urb *urb) |
| 188 | { | 188 | { |
| 189 | int err = 0; | 189 | int err = 0; |
| 190 | struct usX2Ydev *usX2Y = urb->context; | 190 | struct usX2Ydev *usX2Y = urb->context; |
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index f6bd0dee563c..e662281a751a 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c | |||
| @@ -306,7 +306,7 @@ static void usX2Y_error_sequence(struct usX2Ydev *usX2Y, | |||
| 306 | usX2Y_clients_stop(usX2Y); | 306 | usX2Y_clients_stop(usX2Y); |
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | static void i_usX2Y_urb_complete(struct urb *urb, struct pt_regs *regs) | 309 | static void i_usX2Y_urb_complete(struct urb *urb) |
| 310 | { | 310 | { |
| 311 | struct snd_usX2Y_substream *subs = urb->context; | 311 | struct snd_usX2Y_substream *subs = urb->context; |
| 312 | struct usX2Ydev *usX2Y = subs->usX2Y; | 312 | struct usX2Ydev *usX2Y = subs->usX2Y; |
| @@ -350,7 +350,7 @@ static void i_usX2Y_urb_complete(struct urb *urb, struct pt_regs *regs) | |||
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | static void usX2Y_urbs_set_complete(struct usX2Ydev * usX2Y, | 352 | static void usX2Y_urbs_set_complete(struct usX2Ydev * usX2Y, |
| 353 | void (*complete)(struct urb *, struct pt_regs *)) | 353 | void (*complete)(struct urb *)) |
| 354 | { | 354 | { |
| 355 | int s, u; | 355 | int s, u; |
| 356 | for (s = 0; s < 4; s++) { | 356 | for (s = 0; s < 4; s++) { |
| @@ -370,7 +370,7 @@ static void usX2Y_subs_startup_finish(struct usX2Ydev * usX2Y) | |||
| 370 | usX2Y->prepare_subs = NULL; | 370 | usX2Y->prepare_subs = NULL; |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | static void i_usX2Y_subs_startup(struct urb *urb, struct pt_regs *regs) | 373 | static void i_usX2Y_subs_startup(struct urb *urb) |
| 374 | { | 374 | { |
| 375 | struct snd_usX2Y_substream *subs = urb->context; | 375 | struct snd_usX2Y_substream *subs = urb->context; |
| 376 | struct usX2Ydev *usX2Y = subs->usX2Y; | 376 | struct usX2Ydev *usX2Y = subs->usX2Y; |
| @@ -382,7 +382,7 @@ static void i_usX2Y_subs_startup(struct urb *urb, struct pt_regs *regs) | |||
| 382 | wake_up(&usX2Y->prepare_wait_queue); | 382 | wake_up(&usX2Y->prepare_wait_queue); |
| 383 | } | 383 | } |
| 384 | 384 | ||
| 385 | i_usX2Y_urb_complete(urb, regs); | 385 | i_usX2Y_urb_complete(urb); |
| 386 | } | 386 | } |
| 387 | 387 | ||
| 388 | static void usX2Y_subs_prepare(struct snd_usX2Y_substream *subs) | 388 | static void usX2Y_subs_prepare(struct snd_usX2Y_substream *subs) |
| @@ -663,7 +663,7 @@ static struct s_c2 SetRate48000[] = | |||
| 663 | }; | 663 | }; |
| 664 | #define NOOF_SETRATE_URBS ARRAY_SIZE(SetRate48000) | 664 | #define NOOF_SETRATE_URBS ARRAY_SIZE(SetRate48000) |
| 665 | 665 | ||
| 666 | static void i_usX2Y_04Int(struct urb *urb, struct pt_regs *regs) | 666 | static void i_usX2Y_04Int(struct urb *urb) |
| 667 | { | 667 | { |
| 668 | struct usX2Ydev *usX2Y = urb->context; | 668 | struct usX2Ydev *usX2Y = urb->context; |
| 669 | 669 | ||
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index 88b72b52590f..9acef9d90543 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.c +++ b/sound/usb/usx2y/usx2yhwdeppcm.c | |||
| @@ -226,7 +226,7 @@ static inline int usX2Y_usbpcm_usbframe_complete(struct snd_usX2Y_substream *cap | |||
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | 228 | ||
| 229 | static void i_usX2Y_usbpcm_urb_complete(struct urb *urb, struct pt_regs *regs) | 229 | static void i_usX2Y_usbpcm_urb_complete(struct urb *urb) |
| 230 | { | 230 | { |
| 231 | struct snd_usX2Y_substream *subs = urb->context; | 231 | struct snd_usX2Y_substream *subs = urb->context; |
| 232 | struct usX2Ydev *usX2Y = subs->usX2Y; | 232 | struct usX2Ydev *usX2Y = subs->usX2Y; |
| @@ -294,7 +294,7 @@ static void usX2Y_usbpcm_subs_startup_finish(struct usX2Ydev * usX2Y) | |||
| 294 | usX2Y->prepare_subs = NULL; | 294 | usX2Y->prepare_subs = NULL; |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | static void i_usX2Y_usbpcm_subs_startup(struct urb *urb, struct pt_regs *regs) | 297 | static void i_usX2Y_usbpcm_subs_startup(struct urb *urb) |
| 298 | { | 298 | { |
| 299 | struct snd_usX2Y_substream *subs = urb->context; | 299 | struct snd_usX2Y_substream *subs = urb->context; |
| 300 | struct usX2Ydev *usX2Y = subs->usX2Y; | 300 | struct usX2Ydev *usX2Y = subs->usX2Y; |
| @@ -311,7 +311,7 @@ static void i_usX2Y_usbpcm_subs_startup(struct urb *urb, struct pt_regs *regs) | |||
| 311 | wake_up(&usX2Y->prepare_wait_queue); | 311 | wake_up(&usX2Y->prepare_wait_queue); |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | i_usX2Y_usbpcm_urb_complete(urb, regs); | 314 | i_usX2Y_usbpcm_urb_complete(urb); |
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | /* | 317 | /* |
