diff options
| author | Paweł Szewczyk <p.szewczyk@samsung.com> | 2018-06-28 14:58:42 +0200 |
|---|---|---|
| committer | Paweł Szewczyk <p.szewczyk@samsung.com> | 2018-06-28 14:58:42 +0200 |
| commit | 4f733c9d09ab6cfb49debf2484bb25c03544084b (patch) | |
| tree | 72b0899ec818db6fc268add43df9c17be91a0029 | |
| parent | 524dbbbf313bda840ca8d6e02abe8674536d605f (diff) | |
| download | device-manager-plugin-emul-4f733c9d09ab6cfb49debf2484bb25c03544084b.tar.gz device-manager-plugin-emul-4f733c9d09ab6cfb49debf2484bb25c03544084b.tar.bz2 device-manager-plugin-emul-4f733c9d09ab6cfb49debf2484bb25c03544084b.zip | |
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>
| -rw-r--r-- | hw/usb_gadget/usb_gadget.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/hw/usb_gadget/usb_gadget.c b/hw/usb_gadget/usb_gadget.c index a7ddd9f..2dd1760 100644 --- 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 |