diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-10-31 11:49:09 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-12-12 13:45:10 +0400 |
| commit | 7aac8d1537b1fd1a9e39bd16edcd6728c19f8dd5 (patch) | |
| tree | 7753f13aa6f376f4389e7a5c608eb9c72baaaf91 /drivers | |
| parent | 4825093e9d0692a2a1f1615ab69246ac07b17f2f (diff) | |
| download | linux-7aac8d1537b1fd1a9e39bd16edcd6728c19f8dd5.tar.xz | |
usb: gadget: renesas_usbhs: parameter cleanup for usbhsh_device_xx()
current mod_host used usbhs_device_alloc/free(),
but allocated variable was attached to each xx->hcpriv.
The intuitively clear name was not xxx_alloc/free() but xxx_attach/detach().
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/renesas_usbhs/mod_host.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/usb/renesas_usbhs/mod_host.c b/drivers/usb/renesas_usbhs/mod_host.c index 11c615d8d0d2..182bdb8e45ec 100644 --- a/drivers/usb/renesas_usbhs/mod_host.c +++ b/drivers/usb/renesas_usbhs/mod_host.c @@ -220,7 +220,7 @@ static int usbhsh_device_has_endpoint(struct usbhsh_device *udev) return !list_empty(&udev->ep_list_head); } -static struct usbhsh_device *usbhsh_device_alloc(struct usbhsh_hpriv *hpriv, +static struct usbhsh_device *usbhsh_device_attach(struct usbhsh_hpriv *hpriv, struct urb *urb) { struct usbhsh_device *udev = NULL; @@ -307,7 +307,7 @@ static struct usbhsh_device *usbhsh_device_alloc(struct usbhsh_hpriv *hpriv, return udev; } -static void usbhsh_device_free(struct usbhsh_hpriv *hpriv, +static void usbhsh_device_detach(struct usbhsh_hpriv *hpriv, struct usbhsh_device *udev) { struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv); @@ -744,7 +744,7 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd, struct device *dev = usbhs_priv_to_dev(priv); struct usb_device *usbv = usbhsh_urb_to_usbv(urb); struct usb_host_endpoint *ep = urb->ep; - struct usbhsh_device *udev, *new_udev = NULL; + struct usbhsh_device *new_udev = NULL; int is_dir_in = usb_pipein(urb->pipe); int ret; @@ -756,15 +756,12 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd, goto usbhsh_urb_enqueue_error_not_linked; /* - * get udev + * attach udev if needed */ - udev = usbhsh_usbv_to_udev(usbv); - if (!udev) { - new_udev = usbhsh_device_alloc(hpriv, urb); + if (!usbhsh_usbv_to_udev(usbv)) { + new_udev = usbhsh_device_attach(hpriv, urb); if (!new_udev) goto usbhsh_urb_enqueue_error_not_linked; - - udev = new_udev; } /* @@ -788,7 +785,7 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd, usbhsh_urb_enqueue_error_free_device: if (new_udev) - usbhsh_device_free(hpriv, new_udev); + usbhsh_device_detach(hpriv, new_udev); usbhsh_urb_enqueue_error_not_linked: dev_dbg(dev, "%s error\n", __func__); @@ -831,7 +828,7 @@ static void usbhsh_endpoint_disable(struct usb_hcd *hcd, * free device */ if (!usbhsh_device_has_endpoint(udev)) - usbhsh_device_free(hpriv, udev); + usbhsh_device_detach(hpriv, udev); } static int usbhsh_hub_status_data(struct usb_hcd *hcd, char *buf) |