usb_gadget: Change name of double-defined functions

Some functions were defined in hwcommon library with the same names as
those in this implementation. Changing their names fixes this problem.

Change-Id: I6425076d52d6ad11d3a6eeb9ac66b863f313cd04
Signed-off-by: Paweł Szewczyk <p.szewczyk@samsung.com>

diff --git a/hw/usb_gadget/usb_gadget.c b/hw/usb_gadget/usb_gadget.c
index a7ddd9f8e2d12d1d705810a3a964ae5e1b4a50e2..2dd1760d33fcfc7276522880c1f93d86ee3f067e 100644 (file)
--- a/hw/usb_gadget/usb_gadget.c
+++ b/hw/usb_gadget/usb_gadget.c
@@ -25,17 +25,17 @@
 
 #define zalloc(amount) calloc(1, amount)
 
-static void simple_cleanup_gadget(struct usb_gadget *gadget)
+static void emul_cleanup_gadget(struct usb_gadget *gadget)
 {
 }
 
-static int simple_id_to_gadget(struct usb_gadget_id *gadget_id,
+static int emul_id_to_gadget(struct usb_gadget_id *gadget_id,
                               struct usb_gadget **_gadget)
 {
        return -ENOTSUP;
 }
 
-static int simple_translator_open(struct hw_info *info,
+static int emul_translator_open(struct hw_info *info,
                const char *id, struct hw_common **common)
 {
        struct usb_gadget_translator *simple_translator;
@@ -48,14 +48,14 @@ static int simple_translator_open(struct hw_info *info,
                return -ENOMEM;
 
        simple_translator->common.info = info;
-       simple_translator->id_to_gadget = simple_id_to_gadget;
-       simple_translator->cleanup_gadget = simple_cleanup_gadget;
+       simple_translator->id_to_gadget = emul_id_to_gadget;
+       simple_translator->cleanup_gadget = emul_cleanup_gadget;
 
        *common = &simple_translator->common;
        return 0;
 }
 
-static int simple_translator_close(struct hw_common *common)
+static int emul_translator_close(struct hw_common *common)
 {
        struct usb_gadget_translator *simple_translator;
 
@@ -75,8 +75,8 @@ HARDWARE_MODULE_STRUCTURE = {
        .device_version = USB_GADGET_DEVICE_VERSION,
        .id = USB_GADGET_DEVICE_ID,
        .name = "simple_translator",
-       .open = simple_translator_open,
-       .close = simple_translator_close,
+       .open = emul_translator_open,
+       .close = emul_translator_close,
 };
 
 #endif