Add warning fixes

3 files changed, 60 insertions, 0 deletions

diff --git a/queue-3.16/series b/queue-3.16/series
index 3807a922..2c085405 100644
--- a/queue-3.16/series
+++ b/queue-3.16/series
@@ -1,3 +1,5 @@
 revert-brcmfmac-assure-ssid-length--from-firmware-is-limited.patch
 brcmfmac-add-length-checks-in-scheduled-scan-result-handler.patch
 inet-update-the-ip-id-generation-algorithm-to-higher-standards.patch
+spi-omap-100k-remove-unused-definitions.patch
+vxlan-fix-big-endian-declaration-of-vni.patch
diff --git a/queue-3.16/spi-omap-100k-remove-unused-definitions.patch b/queue-3.16/spi-omap-100k-remove-unused-definitions.patch
new file mode 100644
index 00000000..2bb47335
--- /dev/null
+++ b/queue-3.16/spi-omap-100k-remove-unused-definitions.patch
@@ -0,0 +1,34 @@
+From: Nick Krause <xerofoiffy@gmail.com>
+Date: Wed, 6 Aug 2014 13:53:17 -0400
+Subject: spi: omap-100k: Remove unused definitions
+
+commit 9f5b8b4f56dd194fd33021810636879036d2acdd upstream.
+
+Remove unused definition which cause the following warnings
+
+drivers/spi/spi-omap-100k.c:73:0: warning: "WRITE" redefined [enabled by default]
+include/linux/fs.h:193:0: note: this is the location of the previous definition
+drivers/spi/spi-omap-100k.c:74:0: warning: "READ" redefined [enabled by default]
+include/linux/fs.h:192:0: note: this is the location of the previous definition
+
+Signed-off-by: Nick Krause <xerofoiffy@gmail.com>
+Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Signed-off-by: Mark Brown <broonie@linaro.org>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/spi/spi-omap-100k.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+--- a/drivers/spi/spi-omap-100k.c
++++ b/drivers/spi/spi-omap-100k.c
+@@ -70,10 +70,6 @@
+ #define SPI_STATUS_WE                   (1UL << 1)
+ #define SPI_STATUS_RD                   (1UL << 0)
+ 
+-#define WRITE 0
+-#define READ  1
+-
+-
+ /* use PIO for small transfers, avoiding DMA setup/teardown overhead and
+  * cache operations; better heuristics consider wordsize and bitrate.
+  */
diff --git a/queue-3.16/vxlan-fix-big-endian-declaration-of-vni.patch b/queue-3.16/vxlan-fix-big-endian-declaration-of-vni.patch
new file mode 100644
index 00000000..2eb30b64
--- /dev/null
+++ b/queue-3.16/vxlan-fix-big-endian-declaration-of-vni.patch
@@ -0,0 +1,24 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 07 May 2019 19:17:39 +0100
+Subject: vxlan: Fix big-endian declaration of VNI
+
+In this version of the driver, VNIs are consistently kept in host
+order.  However vxlan_fdb_create() erroneously declares its vni
+parameter as __be32, which sparse warns about.  Change it to __u32.
+
+This was resolved upstream by commit 54bfd872bf16 "vxlan: keep flags
+and vni in network byte order".
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+--- a/drivers/net/vxlan.c
++++ b/drivers/net/vxlan.c
+@@ -706,7 +706,7 @@ static struct vxlan_fdb *vxlan_fdb_alloc
+ static int vxlan_fdb_create(struct vxlan_dev *vxlan,
+ 			    const u8 *mac, union vxlan_addr *ip,
+ 			    __u16 state, __be16 port,
+-			    __be32 vni, __u32 ifindex, __u8 ndm_flags,
++			    __u32 vni, __u32 ifindex, __u8 ndm_flags,
+ 			    struct vxlan_fdb **fdb)
+ {
+ 	struct vxlan_rdst *rd = NULL;