Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.09-android

* 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android:
  net: sysctl_net_core: delete unused variable
  usb: gadget: configfs: fix unused variable warnings
  net: PPPoPNS: Remove length argument from data_ready
  usb: gadget: function: fix unused function warnings
  android: configs: base: enable Android gadget functions
  usb: gadget: audio_source function depends on SND_PCM
  tcp: Silence warning: ‘in’ may be used uninitialized
  drivers/base: cpu: fix CPU_AUTOPROBE
  of/fdt: fix build warnings in early_init_dt_scan_chosen()

4 files changed, 4 insertions, 9 deletions

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 2d9ee85903e0..23814ec22401 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -401,6 +401,7 @@ config USB_CONFIGFS_F_ACC
 config USB_CONFIGFS_F_AUDIO_SRC
 	boolean "Audio Source gadget"
 	depends on USB_CONFIGFS && USB_CONFIGFS_F_ACC
+	depends on SND_PCM
 	select USB_F_AUDIO_SRC
 	help
 	  USB gadget Audio Source support
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index a8c90eb085f7..fbf07ff48f18 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1701,9 +1701,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)
@@ -1766,9 +1763,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);
 }