diff mbox

[U-Boot,4/4] usb: gadget: Weak board_usb_init/cleanup definitions in USB download gadget code

Message ID 1431798665-28790-4-git-send-email-contact@paulk.fr
State Superseded
Delegated to: Łukasz Majewski
Headers show

Commit Message

Paul Kocialkowski May 16, 2015, 5:51 p.m. UTC
Weak versions of board_usb_init and board_usb_cleanup are defined in common USB
host code, but it is also used for USB device gadgets, so we also need a weak
definition of it when there is no USB host enabled.
Both weak definitions do not conflict.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 drivers/usb/gadget/g_dnl.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

Łukasz Majewski May 18, 2015, 1:02 p.m. UTC | #1
Hi Paul,

> Weak versions of board_usb_init and board_usb_cleanup are defined in
> common USB host code, but it is also used for USB device gadgets, so
> we also need a weak definition of it when there is no USB host
> enabled. Both weak definitions do not conflict.
> 
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> ---
>  drivers/usb/gadget/g_dnl.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
> index ee52a29..ad89a0d 100644
> --- a/drivers/usb/gadget/g_dnl.c
> +++ b/drivers/usb/gadget/g_dnl.c
> @@ -12,6 +12,7 @@
>  
>  #include <mmc.h>
>  #include <part.h>
> +#include <usb.h>
>  
>  #include <g_dnl.h>
>  #include <usb_mass_storage.h>
> @@ -148,6 +149,18 @@ static int g_dnl_config_register(struct
> usb_composite_dev *cdev) }
>  
>  __weak
> +int board_usb_init(int index, enum usb_init_type init)
> +{
> +	return 0;
> +}
> +
> +__weak
> +int board_usb_cleanup(int index, enum usb_init_type init)
> +{
> +	return 0;
> +}
> +
> +__weak
>  int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char
> *name) {
>  	return 0;

Acked-by: Lukasz Majewski <l.majewski@samsung.com>

I will test this patch on my devices and then pull it to u-boot-dfu
tree.

Thanks for your work!
diff mbox

Patch

diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index ee52a29..ad89a0d 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -12,6 +12,7 @@ 
 
 #include <mmc.h>
 #include <part.h>
+#include <usb.h>
 
 #include <g_dnl.h>
 #include <usb_mass_storage.h>
@@ -148,6 +149,18 @@  static int g_dnl_config_register(struct usb_composite_dev *cdev)
 }
 
 __weak
+int board_usb_init(int index, enum usb_init_type init)
+{
+	return 0;
+}
+
+__weak
+int board_usb_cleanup(int index, enum usb_init_type init)
+{
+	return 0;
+}
+
+__weak
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 {
 	return 0;