From patchwork Mon Aug 6 11:11:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1278291 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E1C62DF215 for ; Mon, 6 Aug 2012 11:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755940Ab2HFLMP (ORCPT ); Mon, 6 Aug 2012 07:12:15 -0400 Received: from eu1sys200aog106.obsmtp.com ([207.126.144.121]:40656 "EHLO eu1sys200aog106.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755801Ab2HFLMP (ORCPT ); Mon, 6 Aug 2012 07:12:15 -0400 Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob106.postini.com ([207.126.147.11]) with SMTP ID DSNKUB+mfJtnmx1/3OyNmdeXokcQbhYVFxL1@postini.com; Mon, 06 Aug 2012 11:11:59 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 2FBD549; Mon, 6 Aug 2012 11:11:29 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 1C55C4D; Mon, 6 Aug 2012 07:41:09 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 1CFF824C07C; Mon, 6 Aug 2012 13:11:48 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Mon, 6 Aug 2012 13:11:53 +0200 From: Linus Walleij To: Dmitry Torokhov , Cc: Linus Walleij , Lee Jones Subject: [PATCH] Revert "input: ab8500-ponkey: Create AB8500 domain IRQ mapping" Date: Mon, 6 Aug 2012 13:11:49 +0200 Message-ID: <1344251509-16008-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Linus Walleij This reverts commit ca3b3faf9bee4dc5df4f10eae2d1e48f7de0a8ad. I don't understand this patch. The platform_get_irq_by_name() used above already performs the irqdomain remapping, atleast when using non-devicetree boots. I get the remapped IRQ numbers out, and without reverting this the boot bombs, because the code is trying to remap already remapped IRQs. It looks to me like the ab8500_irq_get_virq() API is completely pointless so something fishy is going on here, did some infrastructure change in the v3.6 merge window? Let's revert it for now. Cc: Lee Jones Signed-off-by: Linus Walleij --- 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;