---

yaml --- r: 280866 b: refs/heads/master c: 3dd4926 h: refs/heads/master v: v3
git-mirror · Dec 12, 2011 · 0fd879c · 0fd879c
1 parent 0ca2156
commit 0fd879c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc9d5c79f681a7bff588d32de9429be360996df7
+refs/heads/master: 3dd492686c063f9fa9417c3888e7a8eeb504b5b9
diff --git a/trunk/drivers/usb/renesas_usbhs/common.c b/trunk/drivers/usb/renesas_usbhs/common.c
@@ -219,7 +219,7 @@ static void usbhsc_bus_init(struct usbhs_priv *priv)
 /*
  *		device configuration
  */
-int usbhs_set_device_speed(struct usbhs_priv *priv, int devnum,
+int usbhs_set_device_config(struct usbhs_priv *priv, int devnum,
 			   u16 upphub, u16 hubport, u16 speed)
 {
 	struct device *dev = usbhs_priv_to_dev(priv);

diff --git a/trunk/drivers/usb/renesas_usbhs/common.h b/trunk/drivers/usb/renesas_usbhs/common.h
@@ -306,7 +306,7 @@ int usbhs_frame_get_num(struct usbhs_priv *priv);
 /*
  * device config
  */
-int usbhs_set_device_speed(struct usbhs_priv *priv, int devnum, u16 upphub,
+int usbhs_set_device_config(struct usbhs_priv *priv, int devnum, u16 upphub,
 			   u16 hubport, u16 speed);
 
 /*

diff --git a/trunk/drivers/usb/renesas_usbhs/mod_host.c b/trunk/drivers/usb/renesas_usbhs/mod_host.c
@@ -317,7 +317,7 @@ static struct usbhsh_device *usbhsh_device_alloc(struct usbhsh_hpriv *hpriv,
 	udev->usbv = usbv;
 
 	/* set device config */
-	usbhs_set_device_speed(priv,
+	usbhs_set_device_config(priv,
 			       usbhsh_device_number(hpriv, udev),
 			       usbhsh_device_number(hpriv, udev),
 			       0, /* FIXME no parent */
@@ -433,7 +433,7 @@ struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
 
 	/*
 	 * usbhs_pipe_config_update() should be called after
-	 * usbhs_device_config()
+	 * usbhs_set_device_config()
 	 * see
 	 *  DCPMAXP/PIPEMAXP
 	 */