Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f26b3a7 authored by Joe Perches's avatar Joe Perches Committed by Jiri Kosina
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 429d646d

drivers/usb/gadget/at91_udc.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1266,7 +1266,6 @@ write_in: 
	csr |= AT91_UDP_TXPKTRDY;

	csr |= AT91_UDP_TXPKTRDY;

	__raw_writel(csr, creg);

	__raw_writel(csr, creg);

	udc->req_pending = 0;

	udc->req_pending = 0;

	return;

}

}





static void handle_ep0(struct at91_udc *udc)

static void handle_ep0(struct at91_udc *udc)

drivers/usb/gadget/f_audio.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -317,8 +317,6 @@ static void f_audio_playback_work(struct work_struct *data) 




	u_audio_playback(&audio->card, play_buf->buf, play_buf->actual);

	u_audio_playback(&audio->card, play_buf->buf, play_buf->actual);

	f_audio_buffer_free(play_buf);

	f_audio_buffer_free(play_buf);



	return;

}

}





static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req)

static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req)

drivers/usb/gadget/f_hid.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -318,8 +318,6 @@ static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req) 
	spin_unlock(&hidg->spinlock);

	spin_unlock(&hidg->spinlock);





	wake_up(&hidg->read_queue);

	wake_up(&hidg->read_queue);



	return;

}

}





static int hidg_setup(struct usb_function *f,

static int hidg_setup(struct usb_function *f,
@@ -413,8 +411,6 @@ static void hidg_disable(struct usb_function *f) 




	usb_ep_disable(hidg->in_ep);

	usb_ep_disable(hidg->in_ep);

	hidg->in_ep->driver_data = NULL;

	hidg->in_ep->driver_data = NULL;



	return;

}

}





static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)

static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)

drivers/usb/gadget/fsl_udc_core.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -287,8 +287,6 @@ static void dr_controller_run(struct fsl_udc *udc) 
	temp = fsl_readl(&dr_regs->usbcmd);

	temp = fsl_readl(&dr_regs->usbcmd);

	temp |= USB_CMD_RUN_STOP;

	temp |= USB_CMD_RUN_STOP;

	fsl_writel(temp, &dr_regs->usbcmd);

	fsl_writel(temp, &dr_regs->usbcmd);



	return;

}

}





static void dr_controller_stop(struct fsl_udc *udc)

static void dr_controller_stop(struct fsl_udc *udc)
@@ -308,8 +306,6 @@ static void dr_controller_stop(struct fsl_udc *udc) 
	tmp = fsl_readl(&dr_regs->usbcmd);

	tmp = fsl_readl(&dr_regs->usbcmd);

	tmp &= ~USB_CMD_RUN_STOP;

	tmp &= ~USB_CMD_RUN_STOP;

	fsl_writel(tmp, &dr_regs->usbcmd);

	fsl_writel(tmp, &dr_regs->usbcmd);



	return;

}

}





static void dr_ep_setup(unsigned char ep_num, unsigned char dir,

static 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, 
	p_QH->max_pkt_length = cpu_to_le32(tmp);

	p_QH->max_pkt_length = cpu_to_le32(tmp);

	p_QH->next_dtd_ptr = 1;

	p_QH->next_dtd_ptr = 1;

	p_QH->size_ioc_int_sts = 0;

	p_QH->size_ioc_int_sts = 0;



	return;

}

}





/* Setup qh structure and ep register for ep0. */

/* Setup qh structure and ep register for ep0. */

drivers/usb/gadget/langwell_udc.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -284,7 +284,6 @@ static void ep0_reset(struct langwell_udc *dev) 
	}

	}





	VDBG(dev, "<--- %s()\n", __func__);

	VDBG(dev, "<--- %s()\n", __func__);

	return;

}

}
@@ -1486,7 +1485,6 @@ static void langwell_udc_start(struct langwell_udc *dev) 
	writel(usbcmd, &dev->op_regs->usbcmd);

	writel(usbcmd, &dev->op_regs->usbcmd);





	DBG(dev, "<--- %s()\n", __func__);

	DBG(dev, "<--- %s()\n", __func__);

	return;

}

}
@@ -1509,7 +1507,6 @@ static void langwell_udc_stop(struct langwell_udc *dev) 
	writel(usbcmd, &dev->op_regs->usbcmd);

	writel(usbcmd, &dev->op_regs->usbcmd);





	DBG(dev, "<--- %s()\n", __func__);

	DBG(dev, "<--- %s()\n", __func__);

	return;

}

}