From 23707802ec6d1f7f40f001c6b7aed46746f11b62 Mon Sep 17 00:00:00 2001 From: "J. Avila" Date: Fri, 5 Feb 2021 00:31:06 +0000 Subject: [PATCH] ANDROID: usb: gadget: configfs: Move CONFIGFS_UEVENT #endif Move the CONFIG_USB_CONFIGFS_UEVENT #endif to cover the configfs_composite_reset() function to prevent an unused function warning when this config is unset. Fixes: 2db4f2a2a8df ("FROMGIT: usb: gadget: configfs: Add a specific configFS reset callback") Signed-off-by: J. Avila Change-Id: I61adc4516dc2574cc7d7a02bcc3fa7d86b8efd1d --- drivers/usb/gadget/configfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index da874c744f6f..9f8daa0239cf 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -1645,8 +1645,6 @@ static void configfs_composite_disconnect(struct usb_gadget *gadget) spin_unlock_irqrestore(&gi->spinlock, flags); } -#endif // CONFIG_USB_CONFIGFS_UEVENT - static void configfs_composite_reset(struct usb_gadget *gadget) { struct usb_composite_dev *cdev; @@ -1669,6 +1667,8 @@ static void configfs_composite_reset(struct usb_gadget *gadget) spin_unlock_irqrestore(&gi->spinlock, flags); } +#endif // CONFIG_USB_CONFIGFS_UEVENT + static void configfs_composite_suspend(struct usb_gadget *gadget) { struct usb_composite_dev *cdev;