aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-08-04 13:40:08 -0400
committerJiri Kosina <jkosina@suse.cz>2010-08-10 08:25:42 -0400
commit7f26b3a7533bbc1ddd88b297c935ee4da8f74cea (patch)
tree28ba09da29cf391405a932ef243ea49d96a21204 /drivers/usb
parent429d646d9aeafdb57717dab75c807215f5cce9c2 (diff)
drivers/usb: Remove unnecessary return's from void functions
Greg prefers this to go through the trivial tree. http://lkml.org/lkml/2010/6/24/1 There are about 2500 void functions in drivers/usb Only a few used return; at end of function. Standardize them a bit. Moved a statement down a line in drivers/usb/host/u132-hcd.c Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/at91_udc.c1
-rw-r--r--drivers/usb/gadget/f_audio.c2
-rw-r--r--drivers/usb/gadget/f_hid.c4
-rw-r--r--drivers/usb/gadget/fsl_udc_core.c6
-rw-r--r--drivers/usb/gadget/langwell_udc.c3
-rw-r--r--drivers/usb/gadget/pxa27x_udc.c2
-rw-r--r--drivers/usb/gadget/rndis.c2
-rw-r--r--drivers/usb/host/ehci-hcd.c1
-rw-r--r--drivers/usb/host/ohci-hcd.c1
-rw-r--r--drivers/usb/host/oxu210hp-hcd.c9
-rw-r--r--drivers/usb/host/pci-quirks.c2
-rw-r--r--drivers/usb/host/u132-hcd.c8
-rw-r--r--drivers/usb/image/microtek.c9
-rw-r--r--drivers/usb/misc/ftdi-elan.c2
-rw-r--r--drivers/usb/mon/mon_main.c2
-rw-r--r--drivers/usb/musb/musb_gadget.c1
-rw-r--r--drivers/usb/serial/cypress_m8.c2
-rw-r--r--drivers/usb/serial/ftdi_sio.c1
-rw-r--r--drivers/usb/serial/garmin_gps.c1
-rw-r--r--drivers/usb/serial/io_edgeport.c11
-rw-r--r--drivers/usb/serial/io_ti.c4
-rw-r--r--drivers/usb/serial/iuu_phoenix.c1
-rw-r--r--drivers/usb/serial/keyspan_pda.c1
-rw-r--r--drivers/usb/serial/mos7720.c6
-rw-r--r--drivers/usb/serial/mos7840.c7
-rw-r--r--drivers/usb/serial/omninet.c2
-rw-r--r--drivers/usb/serial/sierra.c2
-rw-r--r--drivers/usb/serial/spcp8x5.c1
-rw-r--r--drivers/usb/serial/usb_wwan.c1
-rw-r--r--drivers/usb/serial/whiteheat.c6
30 files changed, 2 insertions, 99 deletions
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 93ead19507b6..d90c9e89688e 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1266,7 +1266,6 @@ write_in:
1266 csr |= AT91_UDP_TXPKTRDY; 1266 csr |= AT91_UDP_TXPKTRDY;
1267 __raw_writel(csr, creg); 1267 __raw_writel(csr, creg);
1268 udc->req_pending = 0; 1268 udc->req_pending = 0;
1269 return;
1270} 1269}
1271 1270
1272static void handle_ep0(struct at91_udc *udc) 1271static void handle_ep0(struct at91_udc *udc)
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c
index 1f48ceb55a77..00975ed903d1 100644
--- a/drivers/usb/gadget/f_audio.c
+++ b/drivers/usb/gadget/f_audio.c
@@ -317,8 +317,6 @@ static void f_audio_playback_work(struct work_struct *data)
317 317
318 u_audio_playback(&audio->card, play_buf->buf, play_buf->actual); 318 u_audio_playback(&audio->card, play_buf->buf, play_buf->actual);
319 f_audio_buffer_free(play_buf); 319 f_audio_buffer_free(play_buf);
320
321 return;
322} 320}
323 321
324static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req) 322static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req)
diff --git a/drivers/usb/gadget/f_hid.c b/drivers/usb/gadget/f_hid.c
index 1e00ff9866af..9447427fcbff 100644
--- a/drivers/usb/gadget/f_hid.c
+++ b/drivers/usb/gadget/f_hid.c
@@ -318,8 +318,6 @@ static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req)
318 spin_unlock(&hidg->spinlock); 318 spin_unlock(&hidg->spinlock);
319 319
320 wake_up(&hidg->read_queue); 320 wake_up(&hidg->read_queue);
321
322 return;
323} 321}
324 322
325static int hidg_setup(struct usb_function *f, 323static int hidg_setup(struct usb_function *f,
@@ -413,8 +411,6 @@ static void hidg_disable(struct usb_function *f)
413 411
414 usb_ep_disable(hidg->in_ep); 412 usb_ep_disable(hidg->in_ep);
415 hidg->in_ep->driver_data = NULL; 413 hidg->in_ep->driver_data = NULL;
416
417 return;
418} 414}
419 415
420static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) 416static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 08a9a62a39e3..d933e6398412 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -287,8 +287,6 @@ static void dr_controller_run(struct fsl_udc *udc)
287 temp = fsl_readl(&dr_regs->usbcmd); 287 temp = fsl_readl(&dr_regs->usbcmd);
288 temp |= USB_CMD_RUN_STOP; 288 temp |= USB_CMD_RUN_STOP;
289 fsl_writel(temp, &dr_regs->usbcmd); 289 fsl_writel(temp, &dr_regs->usbcmd);
290
291 return;
292} 290}
293 291
294static void dr_controller_stop(struct fsl_udc *udc) 292static void dr_controller_stop(struct fsl_udc *udc)
@@ -308,8 +306,6 @@ static void dr_controller_stop(struct fsl_udc *udc)
308 tmp = fsl_readl(&dr_regs->usbcmd); 306 tmp = fsl_readl(&dr_regs->usbcmd);
309 tmp &= ~USB_CMD_RUN_STOP; 307 tmp &= ~USB_CMD_RUN_STOP;
310 fsl_writel(tmp, &dr_regs->usbcmd); 308 fsl_writel(tmp, &dr_regs->usbcmd);
311
312 return;
313} 309}
314 310
315static void dr_ep_setup(unsigned char ep_num, unsigned char dir, 311static void dr_ep_setup(unsigned char ep_num, unsigned char dir,
@@ -416,8 +412,6 @@ static void struct_ep_qh_setup(struct fsl_udc *udc, unsigned char ep_num,
416 p_QH->max_pkt_length = cpu_to_le32(tmp); 412 p_QH->max_pkt_length = cpu_to_le32(tmp);
417 p_QH->next_dtd_ptr = 1; 413 p_QH->next_dtd_ptr = 1;
418 p_QH->size_ioc_int_sts = 0; 414 p_QH->size_ioc_int_sts = 0;
419
420 return;
421} 415}
422 416
423/* Setup qh structure and ep register for ep0. */ 417/* Setup qh structure and ep register for ep0. */
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index a3913519fd58..f1a070280c9c 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -284,7 +284,6 @@ static void ep0_reset(struct langwell_udc *dev)
284 } 284 }
285 285
286 VDBG(dev, "<--- %s()\n", __func__); 286 VDBG(dev, "<--- %s()\n", __func__);
287 return;
288} 287}
289 288
290 289
@@ -1486,7 +1485,6 @@ static void langwell_udc_start(struct langwell_udc *dev)
1486 writel(usbcmd, &dev->op_regs->usbcmd); 1485 writel(usbcmd, &dev->op_regs->usbcmd);
1487 1486
1488 DBG(dev, "<--- %s()\n", __func__); 1487 DBG(dev, "<--- %s()\n", __func__);
1489 return;
1490} 1488}
1491 1489
1492 1490
@@ -1509,7 +1507,6 @@ static void langwell_udc_stop(struct langwell_udc *dev)
1509 writel(usbcmd, &dev->op_regs->usbcmd); 1507 writel(usbcmd, &dev->op_regs->usbcmd);
1510 1508
1511 DBG(dev, "<--- %s()\n", __func__); 1509 DBG(dev, "<--- %s()\n", __func__);
1512 return;
1513} 1510}
1514 1511
1515 1512
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 980762453a9c..98dfa181449f 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1394,8 +1394,6 @@ static void pxa_ep_fifo_flush(struct usb_ep *_ep)
1394 } 1394 }
1395 1395
1396 spin_unlock_irqrestore(&ep->lock, flags); 1396 spin_unlock_irqrestore(&ep->lock, flags);
1397
1398 return;
1399} 1397}
1400 1398
1401/** 1399/**
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 020fa5a25fda..eb61ab4b302c 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -916,8 +916,6 @@ void rndis_deregister (int configNr)
916 916
917 if (configNr >= RNDIS_MAX_CONFIGS) return; 917 if (configNr >= RNDIS_MAX_CONFIGS) return;
918 rndis_per_dev_params [configNr].used = 0; 918 rndis_per_dev_params [configNr].used = 0;
919
920 return;
921} 919}
922 920
923int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter) 921int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter)
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index a3ef2a9d9dc2..6fcffe15a005 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1041,7 +1041,6 @@ nogood:
1041 ep->hcpriv = NULL; 1041 ep->hcpriv = NULL;
1042done: 1042done:
1043 spin_unlock_irqrestore (&ehci->lock, flags); 1043 spin_unlock_irqrestore (&ehci->lock, flags);
1044 return;
1045} 1044}
1046 1045
1047static void 1046static void
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 02864a237a2c..3ceb097e165a 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -370,7 +370,6 @@ sanitize:
370 } 370 }
371 ep->hcpriv = NULL; 371 ep->hcpriv = NULL;
372 spin_unlock_irqrestore (&ohci->lock, flags); 372 spin_unlock_irqrestore (&ohci->lock, flags);
373 return;
374} 373}
375 374
376static int ohci_get_frame (struct usb_hcd *hcd) 375static int ohci_get_frame (struct usb_hcd *hcd)
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index f608dfd09a8a..de9e1c35da45 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -544,8 +544,6 @@ static void oxu_buf_free(struct oxu_hcd *oxu, struct ehci_qtd *qtd)
544 qtd->buffer = NULL; 544 qtd->buffer = NULL;
545 545
546 spin_unlock(&oxu->mem_lock); 546 spin_unlock(&oxu->mem_lock);
547
548 return;
549} 547}
550 548
551static inline void ehci_qtd_init(struct ehci_qtd *qtd, dma_addr_t dma) 549static inline void ehci_qtd_init(struct ehci_qtd *qtd, dma_addr_t dma)
@@ -571,8 +569,6 @@ static inline void oxu_qtd_free(struct oxu_hcd *oxu, struct ehci_qtd *qtd)
571 oxu->qtd_used[index] = 0; 569 oxu->qtd_used[index] = 0;
572 570
573 spin_unlock(&oxu->mem_lock); 571 spin_unlock(&oxu->mem_lock);
574
575 return;
576} 572}
577 573
578static struct ehci_qtd *ehci_qtd_alloc(struct oxu_hcd *oxu) 574static struct ehci_qtd *ehci_qtd_alloc(struct oxu_hcd *oxu)
@@ -615,8 +611,6 @@ static void oxu_qh_free(struct oxu_hcd *oxu, struct ehci_qh *qh)
615 oxu->qh_used[index] = 0; 611 oxu->qh_used[index] = 0;
616 612
617 spin_unlock(&oxu->mem_lock); 613 spin_unlock(&oxu->mem_lock);
618
619 return;
620} 614}
621 615
622static void qh_destroy(struct kref *kref) 616static void qh_destroy(struct kref *kref)
@@ -693,8 +687,6 @@ static void oxu_murb_free(struct oxu_hcd *oxu, struct oxu_murb *murb)
693 oxu->murb_used[index] = 0; 687 oxu->murb_used[index] = 0;
694 688
695 spin_unlock(&oxu->mem_lock); 689 spin_unlock(&oxu->mem_lock);
696
697 return;
698} 690}
699 691
700static struct oxu_murb *oxu_murb_alloc(struct oxu_hcd *oxu) 692static struct oxu_murb *oxu_murb_alloc(struct oxu_hcd *oxu)
@@ -3073,7 +3065,6 @@ nogood:
3073 ep->hcpriv = NULL; 3065 ep->hcpriv = NULL;
3074done: 3066done:
3075 spin_unlock_irqrestore(&oxu->lock, flags); 3067 spin_unlock_irqrestore(&oxu->lock, flags);
3076 return;
3077} 3068}
3078 3069
3079static int oxu_get_frame(struct usb_hcd *hcd) 3070static int oxu_get_frame(struct usb_hcd *hcd)
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 83b5f9cea85a..5b37b08e0d80 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -338,8 +338,6 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
338 writel(0x3f, op_reg_base + EHCI_USBSTS); 338 writel(0x3f, op_reg_base + EHCI_USBSTS);
339 339
340 iounmap(base); 340 iounmap(base);
341
342 return;
343} 341}
344 342
345/* 343/*
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 5b31bae92dbc..fab764946c74 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -316,7 +316,6 @@ static void u132_ring_requeue_work(struct u132 *u132, struct u132_ring *ring,
316 } else if (queue_delayed_work(workqueue, &ring->scheduler, 0)) 316 } else if (queue_delayed_work(workqueue, &ring->scheduler, 0))
317 return; 317 return;
318 kref_put(&u132->kref, u132_hcd_delete); 318 kref_put(&u132->kref, u132_hcd_delete);
319 return;
320} 319}
321 320
322static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, 321static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring,
@@ -324,7 +323,6 @@ static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring,
324{ 323{
325 kref_get(&u132->kref); 324 kref_get(&u132->kref);
326 u132_ring_requeue_work(u132, ring, delta); 325 u132_ring_requeue_work(u132, ring, delta);
327 return;
328} 326}
329 327
330static void u132_ring_cancel_work(struct u132 *u132, struct u132_ring *ring) 328static void u132_ring_cancel_work(struct u132 *u132, struct u132_ring *ring)
@@ -543,7 +541,6 @@ static void u132_hcd_giveback_urb(struct u132 *u132, struct u132_endp *endp,
543 mutex_unlock(&u132->scheduler_lock); 541 mutex_unlock(&u132->scheduler_lock);
544 u132_endp_put_kref(u132, endp); 542 u132_endp_put_kref(u132, endp);
545 usb_hcd_giveback_urb(hcd, urb, status); 543 usb_hcd_giveback_urb(hcd, urb, status);
546 return;
547} 544}
548 545
549static void u132_hcd_forget_urb(struct u132 *u132, struct u132_endp *endp, 546static void u132_hcd_forget_urb(struct u132 *u132, struct u132_endp *endp,
@@ -574,8 +571,8 @@ static void u132_hcd_abandon_urb(struct u132 *u132, struct u132_endp *endp,
574 endp->active = 0; 571 endp->active = 0;
575 spin_unlock_irqrestore(&endp->queue_lock.slock, irqs); 572 spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
576 kfree(urbq); 573 kfree(urbq);
577 } usb_hcd_giveback_urb(hcd, urb, status); 574 }
578 return; 575 usb_hcd_giveback_urb(hcd, urb, status);
579} 576}
580 577
581static inline int edset_input(struct u132 *u132, struct u132_ring *ring, 578static inline int edset_input(struct u132 *u132, struct u132_ring *ring,
@@ -3085,7 +3082,6 @@ static void u132_initialise(struct u132 *u132, struct platform_device *pdev)
3085 u132->endp[endps] = NULL; 3082 u132->endp[endps] = NULL;
3086 3083
3087 mutex_unlock(&u132->sw_lock); 3084 mutex_unlock(&u132->sw_lock);
3088 return;
3089} 3085}
3090 3086
3091static int __devinit u132_probe(struct platform_device *pdev) 3087static int __devinit u132_probe(struct platform_device *pdev)
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 3a6bcd5fee09..5a47805d9580 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -398,7 +398,6 @@ void mts_int_submit_urb (struct urb* transfer,
398 context->srb->result = DID_ERROR << 16; 398 context->srb->result = DID_ERROR << 16;
399 mts_transfer_cleanup(transfer); 399 mts_transfer_cleanup(transfer);
400 } 400 }
401 return;
402} 401}
403 402
404 403
@@ -409,7 +408,6 @@ static void mts_transfer_cleanup( struct urb *transfer )
409 408
410 if ( likely(context->final_callback != NULL) ) 409 if ( likely(context->final_callback != NULL) )
411 context->final_callback(context->srb); 410 context->final_callback(context->srb);
412
413} 411}
414 412
415static void mts_transfer_done( struct urb *transfer ) 413static void mts_transfer_done( struct urb *transfer )
@@ -420,8 +418,6 @@ static void mts_transfer_done( struct urb *transfer )
420 context->srb->result |= (unsigned)(*context->scsi_status)<<1; 418 context->srb->result |= (unsigned)(*context->scsi_status)<<1;
421 419
422 mts_transfer_cleanup(transfer); 420 mts_transfer_cleanup(transfer);
423
424 return;
425} 421}
426 422
427 423
@@ -452,8 +448,6 @@ static void mts_data_done( struct urb* transfer )
452 } 448 }
453 449
454 mts_get_status(transfer); 450 mts_get_status(transfer);
455
456 return;
457} 451}
458 452
459 453
@@ -496,8 +490,6 @@ static void mts_command_done( struct urb *transfer )
496 mts_get_status(transfer); 490 mts_get_status(transfer);
497 } 491 }
498 } 492 }
499
500 return;
501} 493}
502 494
503static void mts_do_sg (struct urb* transfer) 495static void mts_do_sg (struct urb* transfer)
@@ -522,7 +514,6 @@ static void mts_do_sg (struct urb* transfer)
522 sg[context->fragment].length, 514 sg[context->fragment].length,
523 context->fragment + 1 == scsi_sg_count(context->srb) ? 515 context->fragment + 1 == scsi_sg_count(context->srb) ?
524 mts_data_done : mts_do_sg); 516 mts_data_done : mts_do_sg);
525 return;
526} 517}
527 518
528static const u8 mts_read_image_sig[] = { 0x28, 00, 00, 00 }; 519static const u8 mts_read_image_sig[] = { 0x28, 00, 00, 00 };
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 82e16630a78b..d7e034a5e1f9 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -456,7 +456,6 @@ static void ftdi_elan_cancel_targets(struct usb_ftdi *ftdi)
456static void ftdi_elan_kick_command_queue(struct usb_ftdi *ftdi) 456static void ftdi_elan_kick_command_queue(struct usb_ftdi *ftdi)
457{ 457{
458 ftdi_command_queue_work(ftdi, 0); 458 ftdi_command_queue_work(ftdi, 0);
459 return;
460} 459}
461 460
462static void ftdi_elan_command_work(struct work_struct *work) 461static void ftdi_elan_command_work(struct work_struct *work)
@@ -483,7 +482,6 @@ static void ftdi_elan_command_work(struct work_struct *work)
483static void ftdi_elan_kick_respond_queue(struct usb_ftdi *ftdi) 482static void ftdi_elan_kick_respond_queue(struct usb_ftdi *ftdi)
484{ 483{
485 ftdi_respond_queue_work(ftdi, 0); 484 ftdi_respond_queue_work(ftdi, 0);
486 return;
487} 485}
488 486
489static void ftdi_elan_respond_work(struct work_struct *work) 487static void ftdi_elan_respond_work(struct work_struct *work)
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
index 812dc288bb8c..10405119985c 100644
--- a/drivers/usb/mon/mon_main.c
+++ b/drivers/usb/mon/mon_main.c
@@ -90,7 +90,6 @@ static void mon_bus_submit(struct mon_bus *mbus, struct urb *urb)
90 r->rnf_submit(r->r_data, urb); 90 r->rnf_submit(r->r_data, urb);
91 } 91 }
92 spin_unlock_irqrestore(&mbus->lock, flags); 92 spin_unlock_irqrestore(&mbus->lock, flags);
93 return;
94} 93}
95 94
96static void mon_submit(struct usb_bus *ubus, struct urb *urb) 95static void mon_submit(struct usb_bus *ubus, struct urb *urb)
@@ -117,7 +116,6 @@ static void mon_bus_submit_error(struct mon_bus *mbus, struct urb *urb, int erro
117 r->rnf_error(r->r_data, urb, error); 116 r->rnf_error(r->r_data, urb, error);
118 } 117 }
119 spin_unlock_irqrestore(&mbus->lock, flags); 118 spin_unlock_irqrestore(&mbus->lock, flags);
120 return;
121} 119}
122 120
123static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error) 121static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error)
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 6fca870e957e..a83a139da5bc 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -829,7 +829,6 @@ void musb_g_rx(struct musb *musb, u8 epnum)
829 DBG(3, "packet waiting for %s%s request\n", 829 DBG(3, "packet waiting for %s%s request\n",
830 musb_ep->desc ? "" : "inactive ", 830 musb_ep->desc ? "" : "inactive ",
831 musb_ep->end_point.name); 831 musb_ep->end_point.name);
832 return;
833} 832}
834 833
835/* ------------------------------------------------------------ */ 834/* ------------------------------------------------------------ */
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index f5d06746cc3b..2edf238b00b9 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -1320,8 +1320,6 @@ continue_read:
1320 cypress_set_dead(port); 1320 cypress_set_dead(port);
1321 } 1321 }
1322 } 1322 }
1323
1324 return;
1325} /* cypress_read_int_callback */ 1323} /* cypress_read_int_callback */
1326 1324
1327 1325
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index e298dc4baed7..e34023ff5771 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2065,7 +2065,6 @@ static void ftdi_set_termios(struct tty_struct *tty,
2065 /* lower DTR/RTS */ 2065 /* lower DTR/RTS */
2066 clear_mctrl(port, TIOCM_DTR | TIOCM_RTS); 2066 clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
2067 } 2067 }
2068 return;
2069} 2068}
2070 2069
2071static int ftdi_tiocmget(struct tty_struct *tty, struct file *file) 2070static int ftdi_tiocmget(struct tty_struct *tty, struct file *file)
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index a42b29a695b2..26710b189918 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1264,7 +1264,6 @@ static void garmin_read_bulk_callback(struct urb *urb)
1264 garmin_data_p->flags &= ~FLAGS_BULK_IN_ACTIVE; 1264 garmin_data_p->flags &= ~FLAGS_BULK_IN_ACTIVE;
1265 spin_unlock_irqrestore(&garmin_data_p->lock, flags); 1265 spin_unlock_irqrestore(&garmin_data_p->lock, flags);
1266 } 1266 }
1267 return;
1268} 1267}
1269 1268
1270 1269
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 76e6fb3aab7a..892e916ef67e 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -1465,8 +1465,6 @@ static void edge_throttle(struct tty_struct *tty)
1465 if (status != 0) 1465 if (status != 0)
1466 return; 1466 return;
1467 } 1467 }
1468
1469 return;
1470} 1468}
1471 1469
1472 1470
@@ -1770,8 +1768,6 @@ static void edge_break(struct tty_struct *tty, int break_state)
1770 dbg("%s - error sending break set/clear command.", 1768 dbg("%s - error sending break set/clear command.",
1771 __func__); 1769 __func__);
1772 } 1770 }
1773
1774 return;
1775} 1771}
1776 1772
1777 1773
@@ -2042,7 +2038,6 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
2042 dbg("%s - Unrecognized IOSP status code %u", __func__, code); 2038 dbg("%s - Unrecognized IOSP status code %u", __func__, code);
2043 break; 2039 break;
2044 } 2040 }
2045 return;
2046} 2041}
2047 2042
2048 2043
@@ -2095,8 +2090,6 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 newMsr)
2095 2090
2096 /* Save the new modem status */ 2091 /* Save the new modem status */
2097 edge_port->shadowMSR = newMsr & 0xf0; 2092 edge_port->shadowMSR = newMsr & 0xf0;
2098
2099 return;
2100} 2093}
2101 2094
2102 2095
@@ -2143,8 +2136,6 @@ static void handle_new_lsr(struct edgeport_port *edge_port, __u8 lsrData,
2143 icount->parity++; 2136 icount->parity++;
2144 if (newLsr & LSR_FRM_ERR) 2137 if (newLsr & LSR_FRM_ERR)
2145 icount->frame++; 2138 icount->frame++;
2146
2147 return;
2148} 2139}
2149 2140
2150 2141
@@ -2720,7 +2711,6 @@ static void change_port_settings(struct tty_struct *tty,
2720 baud = tty_termios_baud_rate(old_termios); 2711 baud = tty_termios_baud_rate(old_termios);
2721 tty_encode_baud_rate(tty, baud, baud); 2712 tty_encode_baud_rate(tty, baud, baud);
2722 } 2713 }
2723 return;
2724} 2714}
2725 2715
2726 2716
@@ -2922,7 +2912,6 @@ static void load_application_firmware(struct edgeport_serial *edge_serial)
2922 0x40, 0x4000, 0x0001, NULL, 0, 3000); 2912 0x40, 0x4000, 0x0001, NULL, 0, 3000);
2923 2913
2924 release_firmware(fw); 2914 release_firmware(fw);
2925 return;
2926} 2915}
2927 2916
2928 2917
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 0fca2659206f..4a6da66d5fd2 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -1571,8 +1571,6 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr)
1571 } 1571 }
1572 } 1572 }
1573 tty_kref_put(tty); 1573 tty_kref_put(tty);
1574
1575 return;
1576} 1574}
1577 1575
1578static void handle_new_lsr(struct edgeport_port *edge_port, int lsr_data, 1576static void handle_new_lsr(struct edgeport_port *edge_port, int lsr_data,
@@ -2424,7 +2422,6 @@ static void change_port_settings(struct tty_struct *tty,
2424 dbg("%s - error %d when trying to write config to device", 2422 dbg("%s - error %d when trying to write config to device",
2425 __func__, status); 2423 __func__, status);
2426 kfree(config); 2424 kfree(config);
2427 return;
2428} 2425}
2429 2426
2430static void edge_set_termios(struct tty_struct *tty, 2427static void edge_set_termios(struct tty_struct *tty,
@@ -2445,7 +2442,6 @@ static void edge_set_termios(struct tty_struct *tty,
2445 return; 2442 return;
2446 /* change the port settings to the new ones specified */ 2443 /* change the port settings to the new ones specified */
2447 change_port_settings(tty, edge_port, old_termios); 2444 change_port_settings(tty, edge_port, old_termios);
2448 return;
2449} 2445}
2450 2446
2451static int edge_tiocmset(struct tty_struct *tty, struct file *file, 2447static int edge_tiocmset(struct tty_struct *tty, struct file *file,
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 74551cb2e8ee..55766a65f0ad 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -801,7 +801,6 @@ static void read_rxcmd_callback(struct urb *urb)
801 iuu_uart_read_callback, port); 801 iuu_uart_read_callback, port);
802 result = usb_submit_urb(port->read_urb, GFP_ATOMIC); 802 result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
803 dbg("%s - submit result = %d", __func__, result); 803 dbg("%s - submit result = %d", __func__, result);
804 return;
805} 804}
806 805
807static int iuu_uart_on(struct usb_serial_port *port) 806static int iuu_uart_on(struct usb_serial_port *port)
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 185fe9a7d4e0..a10dd5676ccc 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -292,7 +292,6 @@ static void keyspan_pda_rx_unthrottle(struct tty_struct *tty)
292 port->interrupt_in_urb->dev = port->serial->dev; 292 port->interrupt_in_urb->dev = port->serial->dev;
293 if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL)) 293 if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL))
294 dbg(" usb_submit_urb(read urb) failed"); 294 dbg(" usb_submit_urb(read urb) failed");
295 return;
296} 295}
297 296
298 297
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 30922a7e3347..f442333dfa99 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -827,7 +827,6 @@ exit:
827 dev_err(&urb->dev->dev, 827 dev_err(&urb->dev->dev,
828 "%s - Error %d submitting control urb\n", 828 "%s - Error %d submitting control urb\n",
829 __func__, result); 829 __func__, result);
830 return;
831} 830}
832 831
833/* 832/*
@@ -907,7 +906,6 @@ exit:
907 dev_err(&urb->dev->dev, 906 dev_err(&urb->dev->dev,
908 "%s - Error %d submitting control urb\n", 907 "%s - Error %d submitting control urb\n",
909 __func__, result); 908 __func__, result);
910 return;
911} 909}
912 910
913/* 911/*
@@ -1227,8 +1225,6 @@ static void mos7720_break(struct tty_struct *tty, int break_state)
1227 mos7720_port->shadowLCR = data; 1225 mos7720_port->shadowLCR = data;
1228 write_mos_reg(serial, port->number - port->serial->minor, 1226 write_mos_reg(serial, port->number - port->serial->minor,
1229 LCR, mos7720_port->shadowLCR); 1227 LCR, mos7720_port->shadowLCR);
1230
1231 return;
1232} 1228}
1233 1229
1234/* 1230/*
@@ -1746,7 +1742,6 @@ static void change_port_settings(struct tty_struct *tty,
1746 dbg("usb_submit_urb(read bulk) failed, status = %d", 1742 dbg("usb_submit_urb(read bulk) failed, status = %d",
1747 status); 1743 status);
1748 } 1744 }
1749 return;
1750} 1745}
1751 1746
1752/* 1747/*
@@ -1803,7 +1798,6 @@ static void mos7720_set_termios(struct tty_struct *tty,
1803 dbg("usb_submit_urb(read bulk) failed, status = %d", 1798 dbg("usb_submit_urb(read bulk) failed, status = %d",
1804 status); 1799 status);
1805 } 1800 }
1806 return;
1807} 1801}
1808 1802
1809/* 1803/*
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 585b7e663740..d3fc30c5959d 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1355,8 +1355,6 @@ static void mos7840_break(struct tty_struct *tty, int break_state)
1355 mos7840_port->shadowLCR); 1355 mos7840_port->shadowLCR);
1356 mos7840_set_uart_reg(port, LINE_CONTROL_REGISTER, 1356 mos7840_set_uart_reg(port, LINE_CONTROL_REGISTER,
1357 mos7840_port->shadowLCR); 1357 mos7840_port->shadowLCR);
1358
1359 return;
1360} 1358}
1361 1359
1362/***************************************************************************** 1360/*****************************************************************************
@@ -1587,8 +1585,6 @@ static void mos7840_throttle(struct tty_struct *tty)
1587 if (status < 0) 1585 if (status < 0)
1588 return; 1586 return;
1589 } 1587 }
1590
1591 return;
1592} 1588}
1593 1589
1594/***************************************************************************** 1590/*****************************************************************************
@@ -2063,8 +2059,6 @@ static void mos7840_change_port_settings(struct tty_struct *tty,
2063 mos7840_port->delta_msr_cond = 1; 2059 mos7840_port->delta_msr_cond = 1;
2064 dbg("mos7840_change_port_settings mos7840_port->shadowLCR is End %x", 2060 dbg("mos7840_change_port_settings mos7840_port->shadowLCR is End %x",
2065 mos7840_port->shadowLCR); 2061 mos7840_port->shadowLCR);
2066
2067 return;
2068} 2062}
2069 2063
2070/***************************************************************************** 2064/*****************************************************************************
@@ -2133,7 +2127,6 @@ static void mos7840_set_termios(struct tty_struct *tty,
2133 mos7840_port->read_urb_busy = false; 2127 mos7840_port->read_urb_busy = false;
2134 } 2128 }
2135 } 2129 }
2136 return;
2137} 2130}
2138 2131
2139/***************************************************************************** 2132/*****************************************************************************
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 89c724c0ac0a..60f38d5e64fc 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -246,8 +246,6 @@ static void omninet_read_bulk_callback(struct urb *urb)
246 dev_err(&port->dev, 246 dev_err(&port->dev,
247 "%s - failed resubmitting read urb, error %d\n", 247 "%s - failed resubmitting read urb, error %d\n",
248 __func__, result); 248 __func__, result);
249
250 return;
251} 249}
252 250
253static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, 251static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index d47b56e9e8ce..7481ff8a49e4 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -620,8 +620,6 @@ static void sierra_indat_callback(struct urb *urb)
620 dev_err(&port->dev, "resubmit read urb failed." 620 dev_err(&port->dev, "resubmit read urb failed."
621 "(%d)\n", err); 621 "(%d)\n", err);
622 } 622 }
623
624 return;
625} 623}
626 624
627static void sierra_instat_callback(struct urb *urb) 625static void sierra_instat_callback(struct urb *urb)
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 329d311a35d9..765aa983bf58 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -441,7 +441,6 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
441 spcp8x5_set_workMode(serial->dev, 0x000a, 441 spcp8x5_set_workMode(serial->dev, 0x000a,
442 SET_WORKING_MODE_U2C, priv->type); 442 SET_WORKING_MODE_U2C, priv->type);
443 } 443 }
444 return;
445} 444}
446 445
447/* open the serial port. do some usb system call. set termios and get the line 446/* open the serial port. do some usb system call. set termios and get the line
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 0c70b4a621bb..fbc946797801 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -234,7 +234,6 @@ static void usb_wwan_indat_callback(struct urb *urb)
234 } 234 }
235 235
236 } 236 }
237 return;
238} 237}
239 238
240static void usb_wwan_outdat_callback(struct urb *urb) 239static void usb_wwan_outdat_callback(struct urb *urb)
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 12ed8209ca72..3f9ac88d588c 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -655,8 +655,6 @@ static void whiteheat_release(struct usb_serial *serial)
655 } 655 }
656 kfree(info); 656 kfree(info);
657 } 657 }
658
659 return;
660} 658}
661 659
662static int whiteheat_open(struct tty_struct *tty, struct usb_serial_port *port) 660static int whiteheat_open(struct tty_struct *tty, struct usb_serial_port *port)
@@ -955,8 +953,6 @@ static void whiteheat_throttle(struct tty_struct *tty)
955 spin_lock_irq(&info->lock); 953 spin_lock_irq(&info->lock);
956 info->flags |= THROTTLED; 954 info->flags |= THROTTLED;
957 spin_unlock_irq(&info->lock); 955 spin_unlock_irq(&info->lock);
958
959 return;
960} 956}
961 957
962 958
@@ -975,8 +971,6 @@ static void whiteheat_unthrottle(struct tty_struct *tty)
975 971
976 if (actually_throttled) 972 if (actually_throttled)
977 rx_data_softint(&info->rx_work); 973 rx_data_softint(&info->rx_work);
978
979 return;
980} 974}
981 975
982 976