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()

10 files changed, 16 insertions, 15 deletions

diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 07fe39fc9c2a..154bf1647b5e 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -150,5 +150,11 @@ CONFIG_TUN=y
 CONFIG_UNIX=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_MTP=y
+CONFIG_USB_CONFIGFS_F_PTP=y
+CONFIG_USB_CONFIGFS_F_ACC=y
+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
+CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_OTG_WAKELOCK=y
 CONFIG_XFRM_USER=y
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 335e9efc7872..8a38bf8c792f 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -346,7 +346,7 @@ int register_cpu(struct cpu *cpu, int num)
 	cpu->dev.offline_disabled = !cpu->hotpluggable;
 	cpu->dev.offline = !cpu_online(num);
 	cpu->dev.of_node = of_get_cpu_node(num, NULL);
-#ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
+#ifdef CONFIG_HAVE_CPU_AUTOPROBE
 	cpu->dev.bus->uevent = cpu_uevent;
 #endif
 	cpu->dev.groups = common_cpu_attr_groups;
diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c
index 6016d29c0660..dc15f978c922 100644
--- a/drivers/net/ppp/pppopns.c
+++ b/drivers/net/ppp/pppopns.c
@@ -169,7 +169,7 @@ drop:
 	return NET_RX_DROP;
 }
 
-static void pppopns_recv(struct sock *sk_raw, int length)
+static void pppopns_recv(struct sock *sk_raw)
 {
 	struct sk_buff *skb;
 	while ((skb = skb_dequeue(&sk_raw->sk_receive_queue))) {
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index af3b78382d4a..821f6b591ce2 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -911,8 +911,8 @@ static const char *config_cmdline = "";
 int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
 				     int depth, void *data)
 {
-	unsigned long l = 0;
-	char *p = NULL;
+	int l = 0;
+	const char *p = NULL;
 	char *cmdline = data;
 
 	pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);
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);
 }
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index dccd621d6377..070ec7d0df43 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -56,7 +56,7 @@ struct pppopns_opt {
 	__u16		remote;
 	__u32		recv_sequence;
 	__u32		xmit_sequence;
-	void		(*data_ready)(struct sock *sk_raw, int length);
+	void		(*data_ready)(struct sock *sk_raw);
 	int		(*backlog_rcv)(struct sock *sk_raw, struct sk_buff *skb);
 };
 
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 8a84ade3a42c..93e795e18b5c 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3172,7 +3172,7 @@ int tcp_nuke_addr(struct net *net, struct sockaddr *addr)
 	int family = addr->sa_family;
 	unsigned int bucket;
 
-	struct in_addr *in;
+	struct in_addr *in = NULL;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	struct in6_addr *in6 = NULL;
 #endif