From patchwork Tue Jun 7 14:00:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 856572 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p57DrEDo014738 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 7 Jun 2011 13:53:37 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QTwiR-00038l-ML; Tue, 07 Jun 2011 13:53:07 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QTwiR-0003iK-7x; Tue, 07 Jun 2011 13:53:07 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QTwiO-0003hn-8a for linux-arm-kernel@lists.infradead.org; Tue, 07 Jun 2011 13:53:05 +0000 Received: by pzk28 with SMTP id 28so3562198pzk.36 for ; Tue, 07 Jun 2011 06:53:00 -0700 (PDT) Received: by 10.68.63.69 with SMTP id e5mr106087pbs.307.1307454780418; Tue, 07 Jun 2011 06:53:00 -0700 (PDT) Received: from localhost.localdomain ([114.216.150.149]) by mx.google.com with ESMTPS id o2sm159504pbj.81.2011.06.07.06.52.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Jun 2011 06:52:59 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] gpio/mxs: remove irq_high related implementation Date: Tue, 7 Jun 2011 22:00:53 +0800 Message-Id: <1307455254-7604-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110607_095304_545798_6B656123 X-CRM114-Status: GOOD ( 13.62 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] Cc: grant.likely@secretlab.ca, tglx@linutronix.de, Shawn Guo , kernel@pengutronix.de, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 07 Jun 2011 13:53:37 +0000 (UTC) The irq_high stuff was mistakenly copied from mxc gpio driver. The mxs gpio controller has only one irq line for each 32-pin gpio port. The patch remove irq_high related codes. Signed-off-by: Shawn Guo --- drivers/gpio/gpio-mxs.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c index 9d2dba7..ddde0f4 100644 --- a/drivers/gpio/gpio-mxs.c +++ b/drivers/gpio/gpio-mxs.c @@ -53,7 +53,6 @@ struct mxs_gpio_port { void __iomem *base; int id; int irq; - int irq_high; int virtual_irq_start; struct bgpio_chip bgc; }; @@ -174,21 +173,12 @@ static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc) */ static int mxs_gpio_set_wake_irq(struct irq_data *d, unsigned int enable) { - u32 gpio = irq_to_gpio(d->irq); - u32 gpio_idx = gpio & 0x1f; struct mxs_gpio_port *port = irq_data_get_irq_chip_data(d); - if (enable) { - if (port->irq_high && (gpio_idx >= 16)) - enable_irq_wake(port->irq_high); - else - enable_irq_wake(port->irq); - } else { - if (port->irq_high && (gpio_idx >= 16)) - disable_irq_wake(port->irq_high); - else - disable_irq_wake(port->irq); - } + if (enable) + enable_irq_wake(port->irq); + else + disable_irq_wake(port->irq); return 0; }