From patchwork Mon Nov 6 13:34:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 118038 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2772775qgn; Mon, 6 Nov 2017 05:34:55 -0800 (PST) X-Google-Smtp-Source: ABhQp+RUbQ9HNq4J7Q2+uQRIiRdiZ3kx8iHufPNz+IxpBaVcdtDoBfftRYnmyCykZHneiPbPsaS1 X-Received: by 10.159.246.23 with SMTP id b23mr14589035pls.60.1509975295580; Mon, 06 Nov 2017 05:34:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509975295; cv=none; d=google.com; s=arc-20160816; b=ZsB7h8yijDxx+IwK9Xcdk/tOaBXXHQX+D/tPML0VQgDh8RgVIz6aghaUihZVaLAehr Ow6IXfgCZ25SL7MgJbRz/r3Xn4zjuMQu7FVmzTjFRUvs3wsSlP2BqX0ukRN+sP7wWoBu 2HMmznaLnc7oicAqXGIp3UhYv34BpRwUOv/DAjE/PuMFsN6hS1aFyRVowkLw1FSGb3/F ICMq9Tb2qwkAhlkfR3ybqeJv9iCntkliDUwndhNRs5mjCziJrZ0oLSHClLGhv8VlXtys ZLnEvz2xA1HlFIOrXKsHn/Dg4bMo5gVLHim2oxMgnFuRXVi98hYpQvvFSpkgUcAxWpCz SsdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ewul9j61wItC+JVQ1jAWHGdM/7Wmp1aTc8mkIcDI9oo=; b=Wy6baV13BuySbUtjc4/zkjE4RkbpebnZveVa8NXyor0bgQLEP1PLX7k1L/NeftsFg4 fwHhUksI1zZC+6UZlTO7Nozf23PW9iZucQtBOYYg/A+ecfbzv/VPyv/EOSQE9WprObiD b90I2gE5vh00DDhBoBbsr8bLgasw/4ATvaEOX/+0+8oRDLM1hXQBu4h6JZocC7TkDfIF quehbFYoszAzGJL49xFXn6c+LjgWunJwXxLyde5h9XR0AzQf/yCsXzsfuXxY3D43NcFw 78PALuwiwyKn6xfe9cvg9dl5OkJHE5bDute/hn2FpgrdnTXgGZz9aEb+QN9Bxvfz3Uk2 Wh9A== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m25si11376715pgn.588.2017.11.06.05.34.55; Mon, 06 Nov 2017 05:34:55 -0800 (PST) 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 S1753200AbdKFNex (ORCPT + 26 others); Mon, 6 Nov 2017 08:34:53 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:64210 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752750AbdKFNev (ORCPT ); Mon, 6 Nov 2017 08:34:51 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MANKs-1eNE8k46kE-00BbBT; Mon, 06 Nov 2017 14:34:13 +0100 From: Arnd Bergmann To: Thomas Gleixner Cc: Arnd Bergmann , Russell King , Kees Cook , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] [fixup timers-conversion] ARM: footbridge: add missing semicolon Date: Mon, 6 Nov 2017 14:34:01 +0100 Message-Id: <20171106133410.467203-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:9ZvCJGFLJdTgApMN2nwsRB3j2gk0xiQDjkOYcppYdhvCPTLDW2X bjM4bPFxC0xq0CTRNBD83s4QYr/+wOYwAluKBaIHGqAoqceueiiHcDlCGbETtsBqgQa2KD+ EsKIkcPr54PEeZS5PIZcnRGac90M/W2/zP+f+8PZvOYOLBbsBqdutLPUiyW6irvoOlknT3d 2QW7Wm2SEYtYKlyAE0ldg== X-UI-Out-Filterresults: notjunk:1; V01:K0:3qBMl4qqXOw=:fMlNDXWzw78eX7NgBah5of e90iLGLHh5rDfeTqB4XYMWTRaVLSptOvyF5ToCqT/2ISXo6fqkbqAs6jnRSR2PLAzWr0RFd0H PHV6zP5I5Q8RloU+R4fYp+N7bKxpHzjqSGpu2DElahvt6Cdo1SOFvjpM2zy2rqdutR+nHepla n9MFfiDBDfd+bbfVu5cEZSuAjWBJouVvQ6P3SAB2eo56rP89OdpCKUYXpJJDE6xg12u2JJD4S TLaakBOFDSzBqUJGB3tQRZDxONpm/zGhnOVRXwMl8LUyNJxxPi8O1U5f1+0sWM2wWKe6olUu6 ZRY1ECMEFrZB3YsmBIEsXIMBLFFLe0zrVxaOmadenpIpZdLxgC0dcjHf0afbKvG+QSG8ZsLLx vIsS81fOgeHQPAmDeRje5ApuuvxSWullCn88sZcg73hCvFQCQ5c3JnNDXcXoAAsMpMckYI6gm KsiYt0wOf+J4vYninsh7QEDF2NafBM35jrt0On+V++s8uH3NRibk+X/bck7CqSZmpc1FqO/IU 7wYOZSGqOWkgbSH/QBWxxaWh/dUY1OXH3va3/8ZlROShyj7rCdVlNo/sj6icsz22WizEDIR8t IoR9SFD/P2C1wapseqWtiM6cS16qNUKFUNPZwpMu3iy7jNUoIJ1lusopRqmMOt3cJtECDFAYg yN6wRHvAs4OYe07cOo52rmMwSzVOy+GYdieZ4LqeOiVXDLYna+Y7mgX6ILDmgfVVd1N/FaFru TNqSD3NdmgMMS+AGIdtB1ErJuj6JViVNXt50nw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The timer_setup() conversion included a small typo that breaks the build: arch/arm/mach-footbridge/dc21285.c: In function 'dc21285_enable_error': arch/arm/mach-footbridge/dc21285.c:145:2: error: expected ';' before 'else' else if (timer == &perr_timer) Fixes: b7bea32f0cc4 ("ARM: footbridge: Convert timers to use timer_setup()") Cc: Thomas Gleixner Signed-off-by: Arnd Bergmann --- The broken patch is currently in -tip and came in through timers-conversion-next3. Please apply this one on top, or fold it into the original patch if possible --- arch/arm/mach-footbridge/dc21285.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index 8407e4a07c77..e7b350f18f5f 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c @@ -141,7 +141,7 @@ static void dc21285_enable_error(struct timer_list *timer) del_timer(timer); if (timer == &serr_timer) - enable_irq(IRQ_PCI_SERR) + enable_irq(IRQ_PCI_SERR); else if (timer == &perr_timer) enable_irq(IRQ_PCI_PERR); }