Skip to content

Commit

Permalink
usb: gadget: renesas_usbhs: parameter cleanup for usbhsh_device_xx()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kuninori Morimoto authored and Felipe Balbi committed Dec 12, 2011
1 parent 4825093 commit 7aac8d1
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions drivers/usb/renesas_usbhs/mod_host.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}

/*
Expand All @@ -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__);
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 7aac8d1

Please sign in to comment.