From patchwork Sun Dec 15 04:28:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 3350001 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1ABB9C0D4A for ; Sun, 15 Dec 2013 04:49:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5257620702 for ; Sun, 15 Dec 2013 04:49:37 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 53EDF206A6 for ; Sun, 15 Dec 2013 04:49:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vs3MP-00063E-06; Sun, 15 Dec 2013 04:31:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vs3La-0001mb-6z; Sun, 15 Dec 2013 04:30:30 +0000 Received: from mail-ea0-x22a.google.com ([2a00:1450:4013:c01::22a]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vs3KE-0001eO-BM for linux-arm-kernel@lists.infradead.org; Sun, 15 Dec 2013 04:29:07 +0000 Received: by mail-ea0-f170.google.com with SMTP id k10so1580744eaj.1 for ; Sat, 14 Dec 2013 20:28:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o91DRfLxeTCnYZaOWvE8mpaGuqKPqy8mFg5Dzj57aH4=; b=bHC7bCK7pAN4kkSAvUgHGfj6NVRU+6BTzzJSJ88iz6ANpKc+9tAQYRRbw4ScnvDMom SiLXWeMUUOO+Mt2hZnpwMXdPzdoE5tmioghTtCv3ZMA5QJQltULSFsUladVwroT7IcO9 VCmrHG5qIh21AsYe7aSzZOXGNNezmElAKtO3QBsB0H5z21W2BaRXl08GflVpK5xiMZmy icjRRZ9PerOJCp9mbHWUNF0L4FkK847PcAABhpGHr7zRNd06I4zrMqpd2gkE/XyB0tqy ipRCUZ0FV4NTMTa//P/OFuh/AqhvKNVBQhmyYaFrXHsHmaqUTFn6Dq5sIPilRJG3IjJk Vkyg== X-Received: by 10.14.203.6 with SMTP id e6mr10213464eeo.33.1387081724369; Sat, 14 Dec 2013 20:28:44 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id n1sm25702696eep.20.2013.12.14.20.28.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 14 Dec 2013 20:28:43 -0800 (PST) From: Dmitry Eremin-Solenikov To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 10/10] ARM: locomo: don't clobber chip data for chained irq Date: Sun, 15 Dec 2013 08:28:17 +0400 Message-Id: <1387081697-21841-11-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1387081697-21841-1-git-send-email-dbaryshkov@gmail.com> References: <1387081697-21841-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131214_232906_594264_AFDF55AF X-CRM114-Status: GOOD ( 13.04 ) X-Spam-Score: -2.0 (--) Cc: Linus Walleij , Russell King , Dmitry Artamonow X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently locomo uses chip data to pass private data to chained irq handler. Thus it clobbers the private data of the corresponding chip (sa1100 or pxa). Make locomo use handler data for this purpose. Signed-off-by: Dmitry Eremin-Solenikov --- arch/arm/common/locomo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index b55c362..f26bd50 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c @@ -140,7 +140,7 @@ static struct locomo_dev_info locomo_devices[] = { static void locomo_handler(unsigned int irq, struct irq_desc *desc) { - struct locomo *lchip = irq_get_chip_data(irq); + struct locomo *lchip = irq_get_handler_data(irq); int req, i; /* Acknowledge the parent IRQ */ @@ -198,7 +198,7 @@ static void locomo_setup_irq(struct locomo *lchip) * Install handler for IRQ_LOCOMO_HW. */ irq_set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING); - irq_set_chip_data(lchip->irq, lchip); + irq_set_handler_data(lchip->irq, lchip); irq_set_chained_handler(lchip->irq, locomo_handler); /* Install handlers for IRQ_LOCOMO_* */