iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: gadget: renesas_usbhs: cleanup usbhsh_endpoint_xxx()

Browse Source 
this patch cleanup
 - make sure static function
 - remove unneeded label
 - useless local variable were removed

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Kuninori Morimoto 2011-10-31 00:48:22 -07:00 committed by Felipe Balbi
parent d399f90d19
commit f352741d27
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/usb/renesas_usbhs/mod_host.c
View File

@ -340,36 +340,26 @@ static void usbhsh_device_free(struct usbhsh_hpriv *hpriv,
/* /*
* end-point control * end-point control
*/ */
struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv, static struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
struct usbhsh_device *udev, struct usbhsh_device *udev,
struct usb_host_endpoint *ep, struct usb_host_endpoint *ep,
int dir_in_req, int dir_in_req,
gfp_t mem_flags) gfp_t mem_flags)
{ {
struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv); struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
struct usbhsh_ep *uep; struct usbhsh_ep *uep;
struct usbhsh_pipe_info *info; struct usbhsh_pipe_info *info;
struct usbhs_pipe *pipe, *best_pipe; struct usbhs_pipe *best_pipe = NULL;
struct device *dev = usbhsh_hcd_to_dev(hcd); struct device *dev = usbhs_priv_to_dev(priv);
struct usb_endpoint_descriptor *desc = &ep->desc; struct usb_endpoint_descriptor *desc = &ep->desc;
int type, i, dir_in;
unsigned int min_usr;
unsigned long flags; unsigned long flags;
dir_in_req = !!dir_in_req;
uep = kzalloc(sizeof(struct usbhsh_ep), mem_flags); uep = kzalloc(sizeof(struct usbhsh_ep), mem_flags);
if (!uep) { if (!uep) {
dev_err(dev, "usbhsh_ep alloc fail\n"); dev_err(dev, "usbhsh_ep alloc fail\n");
return NULL; return NULL;
} }
if (usb_endpoint_xfer_control(desc)) {
best_pipe = usbhsh_hpriv_to_dcp(hpriv);
goto usbhsh_endpoint_alloc_find_pipe;
}
/******************** spin lock ********************/ /******************** spin lock ********************/
usbhs_lock(priv, flags); usbhs_lock(priv, flags);
@ -378,22 +368,29 @@ struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
* see * see
* HARDWARE LIMITATION * HARDWARE LIMITATION
*/ */
type = usb_endpoint_type(desc); if (usb_endpoint_xfer_control(desc)) {
min_usr = ~0; /* best pipe is DCP */
best_pipe = NULL; best_pipe = usbhsh_hpriv_to_dcp(hpriv);
usbhs_for_each_pipe(pipe, priv, i) { } else {
if (!usbhs_pipe_type_is(pipe, type)) struct usbhs_pipe *pipe;
continue; unsigned int min_usr = ~0;
int i, dir_in;
dir_in = !!usbhs_pipe_is_dir_in(pipe); dir_in_req = !!dir_in_req;
if (0 != (dir_in - dir_in_req))
continue;
info = usbhsh_pipe_info(pipe); usbhs_for_each_pipe(pipe, priv, i) {
if (!usbhs_pipe_type_is(pipe, usb_endpoint_type(desc)))
continue;
if (min_usr > info->usr_cnt) { dir_in = !!usbhs_pipe_is_dir_in(pipe);
min_usr = info->usr_cnt; if (0 != (dir_in - dir_in_req))
best_pipe = pipe; continue;
info = usbhsh_pipe_info(pipe);
if (min_usr > info->usr_cnt) {
min_usr = info->usr_cnt;
best_pipe = pipe;
}
} }
} }
@ -415,7 +412,7 @@ struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
kfree(uep); kfree(uep);
return NULL; return NULL;
} }
usbhsh_endpoint_alloc_find_pipe:
/* /*
* init uep * init uep
*/ */
@ -443,7 +440,7 @@ usbhsh_endpoint_alloc_find_pipe:
return uep; return uep;
} }
void usbhsh_endpoint_free(struct usbhsh_hpriv *hpriv, static void usbhsh_endpoint_free(struct usbhsh_hpriv *hpriv,
struct usb_host_endpoint *ep) struct usb_host_endpoint *ep)
{ {
struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv); struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);