diff options
Diffstat (limited to 'drivers/usb/misc/auerswald.c')
-rw-r--r-- | drivers/usb/misc/auerswald.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c index 4fd2110b3411..0be9d62d62ae 100644 --- a/drivers/usb/misc/auerswald.c +++ b/drivers/usb/misc/auerswald.c | |||
@@ -267,7 +267,7 @@ typedef struct | |||
267 | 267 | ||
268 | /*-------------------------------------------------------------------*/ | 268 | /*-------------------------------------------------------------------*/ |
269 | /* Forwards */ | 269 | /* Forwards */ |
270 | static void auerswald_ctrlread_complete (struct urb * urb, struct pt_regs *regs); | 270 | static void auerswald_ctrlread_complete (struct urb * urb); |
271 | static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp); | 271 | static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp); |
272 | static struct usb_driver auerswald_driver; | 272 | static struct usb_driver auerswald_driver; |
273 | 273 | ||
@@ -277,7 +277,7 @@ static struct usb_driver auerswald_driver; | |||
277 | /* -------------------------- */ | 277 | /* -------------------------- */ |
278 | 278 | ||
279 | /* completion function for chained urbs */ | 279 | /* completion function for chained urbs */ |
280 | static void auerchain_complete (struct urb * urb, struct pt_regs *regs) | 280 | static void auerchain_complete (struct urb * urb) |
281 | { | 281 | { |
282 | unsigned long flags; | 282 | unsigned long flags; |
283 | int result; | 283 | int result; |
@@ -296,7 +296,7 @@ static void auerchain_complete (struct urb * urb, struct pt_regs *regs) | |||
296 | NOTE: this function may lead to more urbs submitted into the chain. | 296 | NOTE: this function may lead to more urbs submitted into the chain. |
297 | (no chain lock at calling complete()!) | 297 | (no chain lock at calling complete()!) |
298 | acp->active != NULL is protecting us against recursion.*/ | 298 | acp->active != NULL is protecting us against recursion.*/ |
299 | urb->complete (urb, regs); | 299 | urb->complete (urb); |
300 | 300 | ||
301 | /* detach element from chain data structure */ | 301 | /* detach element from chain data structure */ |
302 | spin_lock_irqsave (&acp->lock, flags); | 302 | spin_lock_irqsave (&acp->lock, flags); |
@@ -331,7 +331,7 @@ static void auerchain_complete (struct urb * urb, struct pt_regs *regs) | |||
331 | urb->status = result; | 331 | urb->status = result; |
332 | dbg("auerchain_complete: usb_submit_urb with error code %d", result); | 332 | dbg("auerchain_complete: usb_submit_urb with error code %d", result); |
333 | /* and do error handling via *this* completion function (recursive) */ | 333 | /* and do error handling via *this* completion function (recursive) */ |
334 | auerchain_complete( urb, NULL); | 334 | auerchain_complete( urb); |
335 | } | 335 | } |
336 | } else { | 336 | } else { |
337 | /* simple return without submitting a new urb. | 337 | /* simple return without submitting a new urb. |
@@ -408,7 +408,7 @@ static int auerchain_submit_urb_list (pauerchain_t acp, struct urb * urb, int ea | |||
408 | urb->status = result; | 408 | urb->status = result; |
409 | dbg("auerchain_submit_urb: usb_submit_urb with error code %d", result); | 409 | dbg("auerchain_submit_urb: usb_submit_urb with error code %d", result); |
410 | /* and do error handling via completion function */ | 410 | /* and do error handling via completion function */ |
411 | auerchain_complete( urb, NULL); | 411 | auerchain_complete( urb); |
412 | } | 412 | } |
413 | } | 413 | } |
414 | 414 | ||
@@ -448,7 +448,7 @@ static int auerchain_unlink_urb (pauerchain_t acp, struct urb * urb) | |||
448 | spin_unlock_irqrestore (&acp->lock, flags); | 448 | spin_unlock_irqrestore (&acp->lock, flags); |
449 | dbg ("unlink waiting urb"); | 449 | dbg ("unlink waiting urb"); |
450 | urb->status = -ENOENT; | 450 | urb->status = -ENOENT; |
451 | urb->complete (urb, NULL); | 451 | urb->complete (urb); |
452 | return 0; | 452 | return 0; |
453 | } | 453 | } |
454 | } | 454 | } |
@@ -505,7 +505,7 @@ static void auerchain_unlink_all (pauerchain_t acp) | |||
505 | spin_unlock_irqrestore (&acp->lock, flags); | 505 | spin_unlock_irqrestore (&acp->lock, flags); |
506 | dbg ("unlink waiting urb"); | 506 | dbg ("unlink waiting urb"); |
507 | urbp->status = -ENOENT; | 507 | urbp->status = -ENOENT; |
508 | urbp->complete (urbp, NULL); | 508 | urbp->complete (urbp); |
509 | spin_lock_irqsave (&acp->lock, flags); | 509 | spin_lock_irqsave (&acp->lock, flags); |
510 | } | 510 | } |
511 | spin_unlock_irqrestore (&acp->lock, flags); | 511 | spin_unlock_irqrestore (&acp->lock, flags); |
@@ -591,7 +591,7 @@ ac_fail:/* free the elements */ | |||
591 | 591 | ||
592 | 592 | ||
593 | /* completion handler for synchronous chained URBs */ | 593 | /* completion handler for synchronous chained URBs */ |
594 | static void auerchain_blocking_completion (struct urb *urb, struct pt_regs *regs) | 594 | static void auerchain_blocking_completion (struct urb *urb) |
595 | { | 595 | { |
596 | pauerchain_chs_t pchs = (pauerchain_chs_t)urb->context; | 596 | pauerchain_chs_t pchs = (pauerchain_chs_t)urb->context; |
597 | pchs->done = 1; | 597 | pchs->done = 1; |
@@ -846,7 +846,7 @@ static int auerswald_status_retry (int status) | |||
846 | } | 846 | } |
847 | 847 | ||
848 | /* Completion of asynchronous write block */ | 848 | /* Completion of asynchronous write block */ |
849 | static void auerchar_ctrlwrite_complete (struct urb * urb, struct pt_regs *regs) | 849 | static void auerchar_ctrlwrite_complete (struct urb * urb) |
850 | { | 850 | { |
851 | pauerbuf_t bp = (pauerbuf_t) urb->context; | 851 | pauerbuf_t bp = (pauerbuf_t) urb->context; |
852 | pauerswald_t cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl))); | 852 | pauerswald_t cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl))); |
@@ -859,7 +859,7 @@ static void auerchar_ctrlwrite_complete (struct urb * urb, struct pt_regs *regs) | |||
859 | } | 859 | } |
860 | 860 | ||
861 | /* Completion handler for dummy retry packet */ | 861 | /* Completion handler for dummy retry packet */ |
862 | static void auerswald_ctrlread_wretcomplete (struct urb * urb, struct pt_regs *regs) | 862 | static void auerswald_ctrlread_wretcomplete (struct urb * urb) |
863 | { | 863 | { |
864 | pauerbuf_t bp = (pauerbuf_t) urb->context; | 864 | pauerbuf_t bp = (pauerbuf_t) urb->context; |
865 | pauerswald_t cp; | 865 | pauerswald_t cp; |
@@ -893,12 +893,12 @@ static void auerswald_ctrlread_wretcomplete (struct urb * urb, struct pt_regs *r | |||
893 | if (ret) { | 893 | if (ret) { |
894 | dbg ("auerswald_ctrlread_complete: nonzero result of auerchain_submit_urb_list %d", ret); | 894 | dbg ("auerswald_ctrlread_complete: nonzero result of auerchain_submit_urb_list %d", ret); |
895 | bp->urbp->status = ret; | 895 | bp->urbp->status = ret; |
896 | auerswald_ctrlread_complete (bp->urbp, NULL); | 896 | auerswald_ctrlread_complete (bp->urbp); |
897 | } | 897 | } |
898 | } | 898 | } |
899 | 899 | ||
900 | /* completion handler for receiving of control messages */ | 900 | /* completion handler for receiving of control messages */ |
901 | static void auerswald_ctrlread_complete (struct urb * urb, struct pt_regs *regs) | 901 | static void auerswald_ctrlread_complete (struct urb * urb) |
902 | { | 902 | { |
903 | unsigned int serviceid; | 903 | unsigned int serviceid; |
904 | pauerswald_t cp; | 904 | pauerswald_t cp; |
@@ -941,7 +941,7 @@ static void auerswald_ctrlread_complete (struct urb * urb, struct pt_regs *regs) | |||
941 | if (ret) { | 941 | if (ret) { |
942 | dbg ("auerswald_ctrlread_complete: nonzero result of auerchain_submit_urb_list %d", ret); | 942 | dbg ("auerswald_ctrlread_complete: nonzero result of auerchain_submit_urb_list %d", ret); |
943 | bp->urbp->status = ret; | 943 | bp->urbp->status = ret; |
944 | auerswald_ctrlread_wretcomplete (bp->urbp, regs); | 944 | auerswald_ctrlread_wretcomplete (bp->urbp); |
945 | } | 945 | } |
946 | return; | 946 | return; |
947 | } | 947 | } |
@@ -970,7 +970,7 @@ static void auerswald_ctrlread_complete (struct urb * urb, struct pt_regs *regs) | |||
970 | messages from the USB device. | 970 | messages from the USB device. |
971 | */ | 971 | */ |
972 | /* int completion handler. */ | 972 | /* int completion handler. */ |
973 | static void auerswald_int_complete (struct urb * urb, struct pt_regs *regs) | 973 | static void auerswald_int_complete (struct urb * urb) |
974 | { | 974 | { |
975 | unsigned long flags; | 975 | unsigned long flags; |
976 | unsigned int channelid; | 976 | unsigned int channelid; |
@@ -1070,7 +1070,7 @@ static void auerswald_int_complete (struct urb * urb, struct pt_regs *regs) | |||
1070 | if (ret) { | 1070 | if (ret) { |
1071 | dbg ("auerswald_int_complete: nonzero result of auerchain_submit_urb %d", ret); | 1071 | dbg ("auerswald_int_complete: nonzero result of auerchain_submit_urb %d", ret); |
1072 | bp->urbp->status = ret; | 1072 | bp->urbp->status = ret; |
1073 | auerswald_ctrlread_complete( bp->urbp, NULL); | 1073 | auerswald_ctrlread_complete( bp->urbp); |
1074 | /* here applies the same problem as above: device locking! */ | 1074 | /* here applies the same problem as above: device locking! */ |
1075 | } | 1075 | } |
1076 | exit: | 1076 | exit: |