From: Greg Kroah-Hartman Date: Thu, 16 Mar 2017 01:37:58 +0000 (+0900) Subject: 4.4-stable patches X-Git-Tag: v4.4.55~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ca7f50067c562143eaf93e841e3c821966e25db;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: mvsas-fix-misleading-indentation.patch --- diff --git a/queue-4.4/mips-ralink-remove-unused-timer-functions.patch b/queue-4.4/mips-ralink-remove-unused-timer-functions.patch deleted file mode 100644 index 90300b8d54a..00000000000 --- a/queue-4.4/mips-ralink-remove-unused-timer-functions.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d92240d12a9c010e0094bbc9280aae4a6be9a2d5 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Tue, 17 Jan 2017 16:18:41 +0100 -Subject: MIPS: ralink: Remove unused timer functions - -From: Arnd Bergmann - -commit d92240d12a9c010e0094bbc9280aae4a6be9a2d5 upstream. - -The functions were originally used for the module unload path, -but are not referenced any more and just cause warnings: - -arch/mips/ralink/timer.c:104:13: error: 'rt_timer_disable' defined but not used [-Werror=unused-function] -arch/mips/ralink/timer.c:74:13: error: 'rt_timer_free' defined but not used [-Werror=unused-function] - -Cc: Paul Gortmaker -Fixes: 62ee73d284e7 ("MIPS: ralink: Make timer explicitly non-modular") -Signed-off-by: Arnd Bergmann -Cc: Paul Gortmaker -Cc: John Crispin -Cc: linux-mips@linux-mips.org -Cc: linux-kernel@vger.kernel.org -Patchwork: https://patchwork.linux-mips.org/patch/15041/ -Signed-off-by: Ralf Baechle -Signed-off-by: Greg Kroah-Hartman - ---- - arch/mips/ralink/timer.c | 14 -------------- - 1 file changed, 14 deletions(-) - ---- a/arch/mips/ralink/timer.c -+++ b/arch/mips/ralink/timer.c -@@ -69,11 +69,6 @@ static int rt_timer_request(struct rt_ti - return err; - } - --static void rt_timer_free(struct rt_timer *rt) --{ -- free_irq(rt->irq, rt); --} -- - static int rt_timer_config(struct rt_timer *rt, unsigned long divisor) - { - if (rt->timer_freq < divisor) -@@ -99,15 +94,6 @@ static int rt_timer_enable(struct rt_tim - return 0; - } - --static void rt_timer_disable(struct rt_timer *rt) --{ -- u32 t; -- -- t = rt_timer_r32(rt, TIMER_REG_TMR0CTL); -- t &= ~TMR0CTL_ENABLE; -- rt_timer_w32(rt, TIMER_REG_TMR0CTL, t); --} -- - static int rt_timer_probe(struct platform_device *pdev) - { - struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/queue-4.4/mvsas-fix-misleading-indentation.patch b/queue-4.4/mvsas-fix-misleading-indentation.patch new file mode 100644 index 00000000000..d0f76bb62f7 --- /dev/null +++ b/queue-4.4/mvsas-fix-misleading-indentation.patch @@ -0,0 +1,38 @@ +From 7789cd39274c51bf475411fe22a8ee7255082809 Mon Sep 17 00:00:00 2001 +From: Luis de Bethencourt +Date: Mon, 30 Nov 2015 14:32:17 +0000 +Subject: mvsas: fix misleading indentation + +From: Luis de Bethencourt + +commit 7789cd39274c51bf475411fe22a8ee7255082809 upstream. + +Fix a smatch warning: +drivers/scsi/mvsas/mv_sas.c:740 mvs_task_prep() warn: curly braces intended? + +The code is correct, the indention is misleading. When the device is not +ready we want to return SAS_PHY_DOWN. But current indentation makes it +look like we only do so in the else branch of if (mvi_dev). + +Signed-off-by: Luis de Bethencourt +Reviewed-by: Johannes Thumshirn +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/mvsas/mv_sas.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/scsi/mvsas/mv_sas.c ++++ b/drivers/scsi/mvsas/mv_sas.c +@@ -737,8 +737,8 @@ static int mvs_task_prep(struct sas_task + mv_dprintk("device %016llx not ready.\n", + SAS_ADDR(dev->sas_addr)); + +- rc = SAS_PHY_DOWN; +- return rc; ++ rc = SAS_PHY_DOWN; ++ return rc; + } + tei.port = dev->port->lldd_port; + if (tei.port && !tei.port->port_attached && !tmf) { diff --git a/queue-4.4/series b/queue-4.4/series index 4b606492a74..db2faf1c03b 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -8,7 +8,6 @@ mips-ip22-fix-ip28-build-for-modern-gcc.patch mips-update-lemote2f_defconfig-for-cpu_freq_stat-change.patch mtd-pmcmsp-use-kstrndup-instead-of-kmalloc-strncpy.patch mips-ralink-cosmetic-change-to-prom_init.patch -mips-ralink-remove-unused-timer-functions.patch mips-ralink-remove-unused-rt-_wdt_reset-functions.patch cpmac-remove-hopeless-warning.patch mm-memcontrol-avoid-unused-function-warning.patch @@ -28,3 +27,4 @@ usb-iowarrior-fix-null-deref-in-write.patch usb-serial-io_ti-fix-null-deref-in-interrupt-callback.patch usb-serial-io_ti-fix-information-leak-in-completion-handler.patch serial-samsung-continue-to-work-if-dma-request-fails.patch +mvsas-fix-misleading-indentation.patch