From patchwork Fri Sep 2 23:22:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101881 Delivered-To: patch@linaro.org Received: by 10.140.29.8 with SMTP id a8csp1121917qga; Fri, 2 Sep 2016 16:22:12 -0700 (PDT) X-Received: by 10.66.52.47 with SMTP id q15mr40428502pao.67.1472858532115; Fri, 02 Sep 2016 16:22:12 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cn6si6084789pac.254.2016.09.02.16.22.11; Fri, 02 Sep 2016 16:22:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754410AbcIBXWJ (ORCPT + 27 others); Fri, 2 Sep 2016 19:22:09 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:54242 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752735AbcIBXWG (ORCPT ); Fri, 2 Sep 2016 19:22:06 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0LrbET-1axNO82poL-013Lm6; Sat, 03 Sep 2016 01:21:53 +0200 From: Arnd Bergmann To: Vinod Koul Cc: yalin wang , Arnd Bergmann , Dan Williams , Thomas Gleixner , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dmaengine: ipu: remove bogus NO_IRQ reference Date: Sat, 3 Sep 2016 01:22:02 +0200 Message-Id: <20160902232211.1829688-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:V74IbM9UaNXOPeuVGyWNjMuZZWi6msumG0YbnYVDhXHH7aZ+BzQ FyQ26UH4cP2tPQO9MaYHhCBVObhqjYJ8/youCOrmcBoNwRdqe866ZM2wd/DCJftX8Kk2NVc /Vm4shjaXbKDtkzInQ9U7RXSA6xSJiaTXXYUnUc1gYrqpourMWNSgceXIRvOOwqdSXP99LX xIt2NW49KUK2FhOk9Axgg== X-UI-Out-Filterresults: notjunk:1; V01:K0:smGTRN1B3jw=:gqGU0iXPo0UCQXDHXP/q91 BiE1t23i/5PerMOj4+XiKo4q4YqVgcnmGS9B3NHowskAaR2IlBwUQOBdDRz+7WG9sWbLgCW7q 9MJlvFF+O93MFqARneJMfvvRzOjf7Y2dIW7dpITepO3JTDHRFlL4k6oO0uQCstqedLjCd9Z5g 0nIBH2AFcjJk+4Kw9diWjCNwHbc5T2SNG8Bv5xPrq+3WOm5HDLCww8BPzyJkiuWCH4/BCEgzA AHlr3pGf6oPxK8RgPvUXlsV5OQR1FsDjuM3L1KVNg/oPM+cDNphmYP2qMt/LgkxyvdurW3NxY 1r3/Nz6xnc4L2l2ubyEMWPc+N6IW8a6kSg2l+G5w2RELs6ORNxaokNDwibAyQcezwmxJ6j7Z4 xZJnjsSYV0FA9OOkJYSWhktWRO+G0337QPTlm3hTvFiMhBMmJRzeCGcNMEF5X3I7uOO8qhhjQ HRJe6roKeKWHuAG8MiyInju0ARiIAVi+H201qix8qy1yjjZ0fy62XU+cB99ycyI3Q7WJEE210 T0NpBrd0ZQAyY/l6CDCwFVGccHbWC009S5uHfCVzXQn/QPEDWK0K8oj9P2AAiNqoOAJPrBvB2 8lLsN5EE3STPCYja3T7j52Pf93fWFyhIzfF4uY5f3Zwj/qFkQ2512Qes1zeOsfuvV8EyNxGhp KRzTFNgI8qj8OSKNoCSuuSv3iH1WbVNJ5bY1ORsR0uTRDfH1Tw1HZxcIDgQQeoTCbQo4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A workaround for a warning introduced a use of the NO_IRQ macro that should have been gone for a long time. It is clear from the code that the value cannot actually be used, but apparently there was a configuration at some point that caused a warning, so instead of just reverting that patch, this rearranges the code in a way that the warning cannot reappear. Signed-off-by: Arnd Bergmann Fixes: 6ef41cf6f721 ("dmaengine :ipu: change ipu_irq_handler() to remove compile warning") --- drivers/dma/ipu/ipu_irq.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.9.0 diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c index 2bf37e68ad0f..dd184b50e5b4 100644 --- a/drivers/dma/ipu/ipu_irq.c +++ b/drivers/dma/ipu/ipu_irq.c @@ -286,22 +286,21 @@ static void ipu_irq_handler(struct irq_desc *desc) raw_spin_unlock(&bank_lock); while ((line = ffs(status))) { struct ipu_irq_map *map; - unsigned int irq = NO_IRQ; + unsigned int irq; line--; status &= ~(1UL << line); raw_spin_lock(&bank_lock); map = src2map(32 * i + line); - if (map) - irq = map->irq; - raw_spin_unlock(&bank_lock); - if (!map) { + raw_spin_unlock(&bank_lock); pr_err("IPU: Interrupt on unmapped source %u bank %d\n", line, i); continue; } + irq = map->irq; + raw_spin_unlock(&bank_lock); generic_handle_irq(irq); } }