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

usb: gadget: renesas_usbhs: fixup struct completion usage

Browse Source 
Since renesas_usbhs mod_host didn't use
struct completion as static object, the warning of lockdep came out.
This patch fixup this issue.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kuninori Morimoto 2011-10-23 22:55:54 -07:00 committed by Greg Kroah-Hartman
parent 0e042be348
commit 7fccd480b7
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ struct usbhsh_hpriv {
u32 port_stat; /* USB_PORT_STAT_xxx */ u32 port_stat; /* USB_PORT_STAT_xxx */
struct completion *done; struct completion setup_ack_done;
/* see usbhsh_req_alloc/free */ /* see usbhsh_req_alloc/free */
struct list_head ureq_link_active; struct list_head ureq_link_active;
@ -549,8 +549,7 @@ static void usbhsh_setup_stage_packet_push(struct usbhsh_hpriv *hpriv,
* usbhsh_irq_setup_ack() * usbhsh_irq_setup_ack()
* usbhsh_irq_setup_err() * usbhsh_irq_setup_err()
*/ */
DECLARE_COMPLETION(done); init_completion(&hpriv->setup_ack_done);
hpriv->done = &done;
/* copy original request */ /* copy original request */
memcpy(&req, urb->setup_packet, sizeof(struct usb_ctrlrequest)); memcpy(&req, urb->setup_packet, sizeof(struct usb_ctrlrequest));
@ -572,8 +571,7 @@ static void usbhsh_setup_stage_packet_push(struct usbhsh_hpriv *hpriv,
/* /*
* wait setup packet ACK * wait setup packet ACK
*/ */
wait_for_completion(&done); wait_for_completion(&hpriv->setup_ack_done);
hpriv->done = NULL;
dev_dbg(dev, "%s done\n", __func__); dev_dbg(dev, "%s done\n", __func__);
} }
@ -1095,10 +1093,7 @@ static int usbhsh_irq_setup_ack(struct usbhs_priv *priv,
dev_dbg(dev, "setup packet OK\n"); dev_dbg(dev, "setup packet OK\n");
if (unlikely(!hpriv->done)) complete(&hpriv->setup_ack_done); /* see usbhsh_urb_enqueue() */
dev_err(dev, "setup ack happen without necessary data\n");
else
complete(hpriv->done); /* see usbhsh_urb_enqueue() */
return 0; return 0;
} }
@ -1111,10 +1106,7 @@ static int usbhsh_irq_setup_err(struct usbhs_priv *priv,
dev_dbg(dev, "setup packet Err\n"); dev_dbg(dev, "setup packet Err\n");
if (unlikely(!hpriv->done)) complete(&hpriv->setup_ack_done); /* see usbhsh_urb_enqueue() */
dev_err(dev, "setup err happen without necessary data\n");
else
complete(hpriv->done); /* see usbhsh_urb_enqueue() */
return 0; return 0;
} }
@ -1279,7 +1271,6 @@ int __devinit usbhs_mod_host_probe(struct usbhs_priv *priv)
hpriv->mod.stop = usbhsh_stop; hpriv->mod.stop = usbhsh_stop;
hpriv->pipe_info = pipe_info; hpriv->pipe_info = pipe_info;
hpriv->pipe_size = pipe_size; hpriv->pipe_size = pipe_size;
hpriv->done = NULL;
usbhsh_req_list_init(hpriv); usbhsh_req_list_init(hpriv);
usbhsh_port_stat_init(hpriv); usbhsh_port_stat_init(hpriv);