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: 1770 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:55:40 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs104082vdc; Tue, 7 Jun 2011 06:53:02 -0700 (PDT) Received: by 10.150.226.14 with SMTP id y14mr5899217ybg.199.1307454781698; Tue, 07 Jun 2011 06:53:01 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id r4si11939789yba.70.2011.06.07.06.53.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Jun 2011 06:53:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by pzk2 with SMTP id 2so2842810pzk.37 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 Cc: grant.likely@secretlab.ca, tglx@linutronix.de, kernel@pengutronix.de, patches@linaro.org, Shawn Guo 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 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; }