From b3467a8e16ac4f8b1ca6555c3c8cac76c18efebf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 5 Nov 2015 18:49:57 -0800 Subject: [PATCH] 3.14-stable patches added patches: power-bq24190_charger-suppress-build-warning.patch sfc-fix-memcpy-with-const-destination-compiler-warning.patch spi-fix-pointer-integer-size-mismatch-warning.patch --- ...24190_charger-suppress-build-warning.patch | 56 +++++++++++++++++++ queue-3.14/series | 3 + ...h-const-destination-compiler-warning.patch | 36 ++++++++++++ ...ointer-integer-size-mismatch-warning.patch | 38 +++++++++++++ 4 files changed, 133 insertions(+) create mode 100644 queue-3.14/power-bq24190_charger-suppress-build-warning.patch create mode 100644 queue-3.14/sfc-fix-memcpy-with-const-destination-compiler-warning.patch create mode 100644 queue-3.14/spi-fix-pointer-integer-size-mismatch-warning.patch diff --git a/queue-3.14/power-bq24190_charger-suppress-build-warning.patch b/queue-3.14/power-bq24190_charger-suppress-build-warning.patch new file mode 100644 index 00000000000..c2d6b17465c --- /dev/null +++ b/queue-3.14/power-bq24190_charger-suppress-build-warning.patch @@ -0,0 +1,56 @@ +From 31f50e48e3e4ea9d503285a389d6a1b5349d66c0 Mon Sep 17 00:00:00 2001 +From: "Lad, Prabhakar" +Date: Thu, 4 Dec 2014 14:56:04 +0000 +Subject: power: bq24190_charger: suppress build warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: "Lad, Prabhakar" + +commit 31f50e48e3e4ea9d503285a389d6a1b5349d66c0 upstream. + +This patch fixes following build warning: + +In file included from include/linux/printk.h:261:0, + from include/linux/kernel.h:13, + from include/linux/list.h:8, + from include/linux/module.h:9, + from drivers/power/bq24190_charger.c:11: +drivers/power/bq24190_charger.c: In function ‘bq24190_irq_handler_thread’: +include/linux/dynamic_debug.h:86:20: warning: ‘ss_reg’ may be used uninitialized in this function [-Wmaybe-uninitialized] + __dynamic_dev_dbg(&descriptor, dev, fmt, \ + ^ +drivers/power/bq24190_charger.c:1211:5: note: ‘ss_reg’ was declared here + u8 ss_reg, f_reg; + ^ +In file included from include/linux/printk.h:261:0, + from include/linux/kernel.h:13, + from include/linux/list.h:8, + from include/linux/module.h:9, + from drivers/power/bq24190_charger.c:11: +include/linux/dynamic_debug.h:86:20: warning: ‘f_reg’ may be used uninitialized in this function [-Wmaybe-uninitialized] + __dynamic_dev_dbg(&descriptor, dev, fmt, \ + ^ +drivers/power/bq24190_charger.c:1211:13: note: ‘f_reg’ was declared here + u8 ss_reg, f_reg; + +Signed-off-by: Lad, Prabhakar +Signed-off-by: Sebastian Reichel +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/power/bq24190_charger.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/power/bq24190_charger.c ++++ b/drivers/power/bq24190_charger.c +@@ -1208,7 +1208,7 @@ static irqreturn_t bq24190_irq_handler_t + { + struct bq24190_dev_info *bdi = data; + bool alert_userspace = false; +- u8 ss_reg, f_reg; ++ u8 ss_reg = 0, f_reg = 0; + int ret; + + pm_runtime_get_sync(bdi->dev); diff --git a/queue-3.14/series b/queue-3.14/series index 72f0a1f4072..b37a3e3f12e 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -12,3 +12,6 @@ drm-nouveau-gem-return-only-valid-domain-when-there-s-only-one.patch drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch drm-i915-restore-lost-dpll-register-write-on-gen2-4.patch drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch +sfc-fix-memcpy-with-const-destination-compiler-warning.patch +power-bq24190_charger-suppress-build-warning.patch +spi-fix-pointer-integer-size-mismatch-warning.patch diff --git a/queue-3.14/sfc-fix-memcpy-with-const-destination-compiler-warning.patch b/queue-3.14/sfc-fix-memcpy-with-const-destination-compiler-warning.patch new file mode 100644 index 00000000000..c61829756ed --- /dev/null +++ b/queue-3.14/sfc-fix-memcpy-with-const-destination-compiler-warning.patch @@ -0,0 +1,36 @@ +From 1d20a16062e771b6e26b843c0cde3b17c1146e00 Mon Sep 17 00:00:00 2001 +From: "David S. Miller" +Date: Fri, 17 Apr 2015 15:15:40 -0400 +Subject: sfc: Fix memcpy() with const destination compiler warning. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: "David S. Miller" + +commit 1d20a16062e771b6e26b843c0cde3b17c1146e00 upstream. + +drivers/net/ethernet/sfc/selftest.c: In function ‘efx_iterate_state’: +drivers/net/ethernet/sfc/selftest.c:388:9: warning: passing argument 1 of ‘memcpy’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-array-qualifiers] + +This is because the msg[] member of struct efx_loopback_payload +is marked as 'const'. Remove that. + +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/sfc/selftest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/sfc/selftest.c ++++ b/drivers/net/ethernet/sfc/selftest.c +@@ -46,7 +46,7 @@ struct efx_loopback_payload { + struct iphdr ip; + struct udphdr udp; + __be16 iteration; +- const char msg[64]; ++ char msg[64]; + } __packed; + + /* Loopback test source MAC address */ diff --git a/queue-3.14/spi-fix-pointer-integer-size-mismatch-warning.patch b/queue-3.14/spi-fix-pointer-integer-size-mismatch-warning.patch new file mode 100644 index 00000000000..9d6a52bf840 --- /dev/null +++ b/queue-3.14/spi-fix-pointer-integer-size-mismatch-warning.patch @@ -0,0 +1,38 @@ +From e1bde3b11fedace5042f0232339da90bc85666af Mon Sep 17 00:00:00 2001 +From: SeongJae Park +Date: Tue, 4 Feb 2014 15:58:09 +0900 +Subject: spi: fix pointer-integer size mismatch warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: SeongJae Park + +commit e1bde3b11fedace5042f0232339da90bc85666af upstream. + +Fix the pointer-integer size mismatch warning below: + drivers/spi/spi-gpio.c: In function ‘spi_gpio_setup’: + drivers/spi/spi-gpio.c:252:8: warning: cast from pointer to integer of + different size [-Wpointer-to-int-cast] + cs = (unsigned int) spi->controller_data; + ^ + +Signed-off-by: SeongJae Park +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/spi/spi-gpio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/spi/spi-gpio.c ++++ b/drivers/spi/spi-gpio.c +@@ -250,7 +250,7 @@ static int spi_gpio_setup(struct spi_dev + /* + * ... otherwise, take it from spi->controller_data + */ +- cs = (unsigned int) spi->controller_data; ++ cs = (unsigned int)(uintptr_t) spi->controller_data; + } + + if (!spi->controller_state) { -- 2.47.2