From patchwork Thu Sep 20 12:12:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1484581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 7B2503FD40 for ; Thu, 20 Sep 2012 12:20:32 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEfgv-0005S3-2J; Thu, 20 Sep 2012 12:17:14 +0000 Received: from mail-wi0-f177.google.com ([209.85.212.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEfd6-0003BO-7d for linux-arm-kernel@lists.infradead.org; Thu, 20 Sep 2012 12:13:18 +0000 Received: by mail-wi0-f177.google.com with SMTP id hn17so391933wib.0 for ; Thu, 20 Sep 2012 05:13:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gxdwClOPSrZIGIRd3mdEw48VZ984ZrcXmwPdMQ1pDL8=; b=iXWs4MjKto0rW5hGwzs3hwfvjb2CEOp9QhHJOj9lTmulMOFcZxR3jKL7Y7WWML4QVn jQUJf/z34eq5hys9v+xyw/nkyku5qAEZXSEMXstcwzy6AIhJLOk8HGofqhg16K8MVl/q 2b+bnZ75qwOHuYe8TgJCM9jyY4r57jw0Vh3WTvdY3DMmW2XYxsZAdPEWuJm0oaUoZgEH cSETAXd4BWAL8fH7KRbm8jBko07k7zdMEoyAPXEaP1SJgadpfjIawJebdyJDQLjX4ieW 49tvgeEKIiFg3KTMD0NsjyDJ86qi987ULpGbV9DS7jKlzaO+C7+ptigBFNN9WA8Hs85+ zpqg== Received: by 10.216.144.71 with SMTP id m49mr1155455wej.23.1348143195846; Thu, 20 Sep 2012 05:13:15 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPS id w7sm32394460wiz.0.2012.09.20.05.13.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:15 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/32] Revert "input: ab8500-ponkey: Create AB8500 domain IRQ mapping" Date: Thu, 20 Sep 2012 14:12:26 +0200 Message-Id: <1348143170-2130-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> References: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQl9MMntvWnIDqGHBlX4SlsMAQfc3/oZznIMdh713upca28HninWythuSddhkzpxVFrfTsuU X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: STEricsson_nomadik_linux@list.st.com, Lee Jones , olof.johansson@gmail.com, linus.walleij@stericsson.com, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 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 This reverts commit ca3b3faf9bee4dc5df4f10eae2d1e48f7de0a8ad. There was a plan to place ab8500_irq_get_virq() calls in each AB8500 child device prior to requesting an IRQ, but as we're no longer using Device Tree to collect our IRQ numbers, it's actually better to allow the core to do this during device registration time. So the IRQ number we pull from its resource has already been converted to a virtual IRQ. Acked-by: Dmitry Torokhov Acked-by: Linus Walleij Signed-off-by: Lee Jones --- drivers/input/misc/ab8500-ponkey.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c index f06231b..84ec691 100644 --- a/drivers/input/misc/ab8500-ponkey.c +++ b/drivers/input/misc/ab8500-ponkey.c @@ -74,8 +74,8 @@ static int __devinit ab8500_ponkey_probe(struct platform_device *pdev) ponkey->idev = input; ponkey->ab8500 = ab8500; - ponkey->irq_dbf = ab8500_irq_get_virq(ab8500, irq_dbf); - ponkey->irq_dbr = ab8500_irq_get_virq(ab8500, irq_dbr); + ponkey->irq_dbf = irq_dbf; + ponkey->irq_dbr = irq_dbr; input->name = "AB8500 POn(PowerOn) Key"; input->dev.parent = &pdev->dev;