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: 10043481 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9CF47603FF for ; Mon, 6 Nov 2017 13:35:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9602D28FAA for ; Mon, 6 Nov 2017 13:35:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A84D29BDE; Mon, 6 Nov 2017 13:35:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 736C528FAA for ; Mon, 6 Nov 2017 13:35:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=oJk0nW92nQDIwB+ItI12IdAhBfhW3Q/SZ9xyaCdkGmU=; b=GNb PwP+ojUhagu16VNlJ/al8zgk9j0OtmX0cEqfMK6GtYJ46qFAM6J5IYucTJtw36EkozC+VvHC3w7PU J3b5YI49SI1xbWjUqtOSgra9O2fepZSkC3vG9/Bm0PL4KowIzunLX//J4O+D4sAvb0MpkyU6vAj5i 5fAQnwQyGvBx8L8n1wvJ2v+Qi4SuGeMGAc09K/MsZ42Nhsv08VpSFw4z46xio+Zi95TZNgLQ3VxbC Lpue6LUpWYpYHfTw/uvF9PaHiBN3PDXr9AohEAGcXVomR9p7m0porYJb9a+k6rFBWBVv4nXa6dCQD vCrEcnqoT7GxbFZJOXhjccJB897u1IA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eBhYC-00037m-4J; Mon, 06 Nov 2017 13:34:52 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eBhY4-00030M-Gp for linux-arm-kernel@lists.infradead.org; Mon, 06 Nov 2017 13:34:50 +0000 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 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== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171106_053444_909831_078FE0A0 X-CRM114-Status: GOOD ( 10.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Russell King , Arnd Bergmann , Kees Cook MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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); }