aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
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/gadget
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/gadget')
-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
7 files changed, 0 insertions, 20 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)