usb: gadget: fix unused function and variable warnings

Use __maybe_unused attribute to fix following
compiler warnings:
----------
  CC      drivers/usb/gadget/function/f_mtp.o
drivers/usb/gadget/function/f_mtp.c:1219:12: warning: ‘mtp_bind_config’ defined but not used [-Wunused-function]
drivers/usb/gadget/function/f_mtp.c:1300:12: warning: ‘mtp_setup’ defined but not used [-Wunused-function]
  LD      drivers/usb/gadget/function/usb_f_mtp.o
  CC      drivers/usb/gadget/function/f_accessory.o
drivers/usb/gadget/function/f_accessory.c:1172:12: warning: ‘acc_bind_config’ defined but not used [-Wunused-function]
  LD      drivers/usb/gadget/function/usb_f_accessory.o
----------

And delete unused ConfigFS variables to
fix following build warnings:
--------------------
  CC      drivers/usb/gadget/configfs.o
drivers/usb/gadget/configfs.c: In function 'gadgets_make':
drivers/usb/gadget/configfs.c:1708:6: warning: unused variable 'err' [-Wunused-variable]
  int err;
      ^
drivers/usb/gadget/configfs.c:1707:27: warning: unused variable 'attr' [-Wunused-variable]
  struct device_attribute *attr;
                           ^
drivers/usb/gadget/configfs.c:1706:28: warning: unused variable 'attrs' [-Wunused-variable]
  struct device_attribute **attrs;
                            ^
drivers/usb/gadget/configfs.c: In function 'gadgets_drop':
drivers/usb/gadget/configfs.c:1772:27: warning: unused variable 'attr' [-Wunused-variable]
  struct device_attribute *attr;
                           ^
drivers/usb/gadget/configfs.c:1771:28: warning: unused variable 'attrs' [-Wunused-variable]
  struct device_attribute **attrs;
                            ^
--------------------

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

3 files changed, 3 insertions, 9 deletions

diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 52ddfec6e289..728c70f2d3da 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1703,9 +1703,6 @@ static struct config_group *gadgets_make(
 		const char *name)
 {
 	struct gadget_info *gi;
-	struct device_attribute **attrs;
-	struct device_attribute *attr;
-	int err;
 
 	gi = kzalloc(sizeof(*gi), GFP_KERNEL);
 	if (!gi)
@@ -1768,9 +1765,6 @@ err:
 
 static void gadgets_drop(struct config_group *group, struct config_item *item)
 {
-	struct device_attribute **attrs;
-	struct device_attribute *attr;
-
 	config_item_put(item);
 	android_device_destroy();
 }
diff --git a/drivers/usb/gadget/function/f_accessory.c b/drivers/usb/gadget/function/f_accessory.c
index dfc508d1da35..95a7bbb69fce 100644
--- a/drivers/usb/gadget/function/f_accessory.c
+++ b/drivers/usb/gadget/function/f_accessory.c
@@ -1169,7 +1169,7 @@ static void acc_function_disable(struct usb_function *f)
 	VDBG(cdev, "%s disabled\n", dev->function.name);
 }
 
-static int acc_bind_config(struct usb_configuration *c)
+static int __maybe_unused acc_bind_config(struct usb_configuration *c)
 {
 	struct acc_dev *dev = _acc_dev;
 	int ret;
diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c
index 03a61f8b9d48..79053fda2864 100644
--- a/drivers/usb/gadget/function/f_mtp.c
+++ b/drivers/usb/gadget/function/f_mtp.c
@@ -1216,7 +1216,7 @@ static void mtp_function_disable(struct usb_function *f)
 	VDBG(cdev, "%s disabled\n", dev->function.name);
 }
 
-static int mtp_bind_config(struct usb_configuration *c, bool ptp_config)
+static int __maybe_unused mtp_bind_config(struct usb_configuration *c, bool ptp_config)
 {
 	struct mtp_dev *dev = _mtp_dev;
 	int ret = 0;
@@ -1297,7 +1297,7 @@ err1:
 	return ret;
 }
 
-static int mtp_setup(void)
+static int __maybe_unused mtp_setup(void)
 {
 	return __mtp_setup(NULL);
 }