From patchwork Wed Jan 23 08:25:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 14234 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 668BB23E1A for ; Wed, 23 Jan 2013 08:26:32 +0000 (UTC) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by fiordland.canonical.com (Postfix) with ESMTP id 17BA3A18D2A for ; Wed, 23 Jan 2013 08:26:32 +0000 (UTC) Received: by mail-vc0-f173.google.com with SMTP id fy7so4273904vcb.18 for ; Wed, 23 Jan 2013 00:26:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=knUew0GhgeoJTbtrC/wyIZFKsya5IFeBreZGGaYWkB0=; b=aiT3n52sSNKc5FPt8uYped3pSt9qeNdP4+aQBNwuDuMYheSEeFxcoQCZbId/X2LYQ4 RqlhC5nObB8l9vDRi86p+5FQ6Z63Ndu0Lu/b/hsVPm989/cvJIf8F2IMHyGtTPvk/gHk 4ElYBjV01ztybCaFWSdAbkNcFGiArHsoVByUjOGKqGW+YK+sDrpHvr4xMu85nnid/PwT WaGlKuTo6j4dTsM3nXHUxDN5dr2XYMWZLt7uAVePza/10CQ+GUr9dCXidC6OMD2uY3za bcPCk3rF0AvbdMX+fSkS+9s68/ASUgBOeOOazT0/PizYB4TLZAjhsCo7zNxyTAeqM16i pQpA== X-Received: by 10.220.209.74 with SMTP id gf10mr472758vcb.10.1358929591584; Wed, 23 Jan 2013 00:26:31 -0800 (PST) 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.58.145.101 with SMTP id st5csp292082veb; Wed, 23 Jan 2013 00:26:31 -0800 (PST) X-Received: by 10.68.241.136 with SMTP id wi8mr1312153pbc.95.1358929590805; Wed, 23 Jan 2013 00:26:30 -0800 (PST) Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com [209.85.220.41]) by mx.google.com with ESMTPS id tp3si19734684pbc.85.2013.01.23.00.26.30 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Jan 2013 00:26:30 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.41 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) client-ip=209.85.220.41; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.41 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) smtp.mail=haojian.zhuang@linaro.org Received: by mail-pa0-f41.google.com with SMTP id bj3so4610286pad.14 for ; Wed, 23 Jan 2013 00:26:30 -0800 (PST) X-Received: by 10.68.252.4 with SMTP id zo4mr1243037pbc.126.1358929590440; Wed, 23 Jan 2013 00:26:30 -0800 (PST) Received: from localhost.localdomain ([98.126.173.75]) by mx.google.com with ESMTPS id qf7sm12392126pbb.49.2013.01.23.00.26.27 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Jan 2013 00:26:29 -0800 (PST) From: Haojian Zhuang To: linux@arm.linux.org.uk, marek.vasut@gmail.com, robert.jarzmik@free.fr, daniel@caiaq.de, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, grant.likely@secretlab.ca, cxie4@marvell.com Cc: patches@linaro.org, Haojian Zhuang Subject: [PATCH 08/10] gpio: pxa: remove arch related macro Date: Wed, 23 Jan 2013 16:25:52 +0800 Message-Id: <1358929554-32265-9-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358929554-32265-1-git-send-email-haojian.zhuang@linaro.org> References: <1358929554-32265-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQkdVsqGi8xrJ6kMQ4QcMtTKedvhBJYBwzqDsccaZfoau8M5SiYjn02Y3a2CCuAbONVrrWl9 Remove macro CONFIG_ARCH_PXA. Signed-off-by: Haojian Zhuang --- drivers/gpio/gpio-pxa.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 5870944..21cf8fd 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -570,21 +570,21 @@ static int pxa_gpio_probe(struct platform_device *pdev) } if (!use_of) { -#ifdef CONFIG_ARCH_PXA - irq = gpio_to_irq(0); - irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip, - handle_edge_irq); - set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); - irq_set_chained_handler(IRQ_GPIO0, pxa_gpio_demux_handler); - - irq = gpio_to_irq(1); - irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip, - handle_edge_irq); - set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); - irq_set_chained_handler(IRQ_GPIO1, pxa_gpio_demux_handler); -#endif - - for (irq = gpio_to_irq(gpio_offset); + if (irq0 > 0) { + irq = gpio_to_irq(0); + irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip, + handle_edge_irq); + set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); + irq_set_chained_handler(irq0, pxa_gpio_demux_handler); + } + if (irq1 > 0) { + irq = gpio_to_irq(1); + irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip, + handle_edge_irq); + set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); + irq_set_chained_handler(irq1, pxa_gpio_demux_handler); + } + for (irq = gpio_to_irq(gpio_offset); irq <= gpio_to_irq(pxa_last_gpio); irq++) { irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip, handle_edge_irq);