From patchwork Tue Jul 19 03:34:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 2750 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E4C5A2405D for ; Tue, 19 Jul 2011 03:22:39 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 94D04A180E5 for ; Tue, 19 Jul 2011 03:22:39 +0000 (UTC) Received: by qwb8 with SMTP id 8so2648212qwb.11 for ; Mon, 18 Jul 2011 20:22:39 -0700 (PDT) Received: by 10.229.68.200 with SMTP id w8mr5913722qci.114.1311045759011; Mon, 18 Jul 2011 20:22:39 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.217.78 with SMTP id hl14cs74331qcb; Mon, 18 Jul 2011 20:22:38 -0700 (PDT) Received: by 10.231.68.210 with SMTP id w18mr6415140ibi.186.1311045758018; Mon, 18 Jul 2011 20:22:38 -0700 (PDT) Received: from mail-iw0-f178.google.com (mail-iw0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id t8si2437293ibt.67.2011.07.18.20.22.37 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Jul 2011 20:22:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by iwc10 with SMTP id 10so4104888iwc.37 for ; Mon, 18 Jul 2011 20:22:37 -0700 (PDT) Received: by 10.42.169.199 with SMTP id c7mr7432200icz.407.1311045757043; Mon, 18 Jul 2011 20:22:37 -0700 (PDT) Received: from localhost.localdomain ([114.216.156.94]) by mx.google.com with ESMTPS id d5sm3303410ibi.62.2011.07.18.20.22.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Jul 2011 20:22:36 -0700 (PDT) From: Shawn Guo To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Grant Likely , patches@linaro.org, Shawn Guo Subject: [PATCH] gpio/mxc/mxs: fix build error introduced by the reanming of irq_gc_ack() Date: Tue, 19 Jul 2011 11:34:04 +0800 Message-Id: <1311046444-25423-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 The following commit renames irq_gc_ack() to irq_gc_ack_set_bit(), and makes gpio-mxc and gpio-mxs fail to build. 659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5 genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd) Signed-off-by: Shawn Guo --- The build error is being seen on linux-next. drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-mxs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 89fda58..4a46fbe 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c @@ -297,7 +297,7 @@ static void __init mxc_gpio_init_gc(struct mxc_gpio_port *port) gc->private = port; ct = gc->chip_types; - ct->chip.irq_ack = irq_gc_ack, + ct->chip.irq_ack = irq_gc_ack_set_bit, ct->chip.irq_mask = irq_gc_mask_clr_bit; ct->chip.irq_unmask = irq_gc_mask_set_bit; ct->chip.irq_set_type = gpio_set_irq_type; diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c index d8cafba..88f8506 100644 --- a/drivers/gpio/gpio-mxs.c +++ b/drivers/gpio/gpio-mxs.c @@ -156,7 +156,7 @@ static void __init mxs_gpio_init_gc(struct mxs_gpio_port *port) gc->private = port; ct = gc->chip_types; - ct->chip.irq_ack = irq_gc_ack, + ct->chip.irq_ack = irq_gc_ack_set_bit, ct->chip.irq_mask = irq_gc_mask_clr_bit; ct->chip.irq_unmask = irq_gc_mask_set_bit; ct->chip.irq_set_type = mxs_gpio_set_irq_type;