From 5ddd6eca575e614b7ad513a8f77dab8f8d67b966 Mon Sep 17 00:00:00 2001 From: Mayank Rana Date: Wed, 23 May 2018 15:05:17 -0700 Subject: [PATCH] usb: Use DECLARE_USB_FUNCTION() for initializing USB QDSS function driver USB QDSS function driver is already registered as module and having init and exit APIs. DECLARE_USB_FUNCTION_INIT() adds additional module entries for USB QDSS function driver. This results into seeing error as "usb_qdss_init: failed to register diag -17" when usb_function_register() is called 2nd time. Hence fix this issue by using DECLARE_USB_FUNCTION() instead of DECLARE_USB_FUNCTION_INIT() API. Change-Id: I37da484eaa44e60e331d18fa720289a2dff8ad50 Signed-off-by: Mayank Rana --- drivers/usb/gadget/function/f_qdss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/function/f_qdss.c b/drivers/usb/gadget/function/f_qdss.c index afb3d3a03253..2c416472e279 100644 --- a/drivers/usb/gadget/function/f_qdss.c +++ b/drivers/usb/gadget/function/f_qdss.c @@ -1,7 +1,7 @@ /* * f_qdss.c -- QDSS function Driver * - * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1162,7 +1162,7 @@ static struct usb_function *qdss_alloc(struct usb_function_instance *fi) return &usb_qdss->port.function; } -DECLARE_USB_FUNCTION_INIT(qdss, qdss_alloc_inst, qdss_alloc); +DECLARE_USB_FUNCTION(qdss, qdss_alloc_inst, qdss_alloc); static int __init usb_qdss_init(void) { int ret;