From patchwork Fri Nov 15 08:47:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 3187231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B89AD9F3AE for ; Fri, 15 Nov 2013 08:49:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC020208CE for ; Fri, 15 Nov 2013 08:49:06 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AFD9C208C4 for ; Fri, 15 Nov 2013 08:49:05 +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 1VhF57-0006Fz-CR; Fri, 15 Nov 2013 08:48:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VhF54-0001Wi-VB; Fri, 15 Nov 2013 08:48:46 +0000 Received: from mail-we0-x229.google.com ([2a00:1450:400c:c03::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VhF51-0001Uj-8T for linux-arm-kernel@lists.infradead.org; Fri, 15 Nov 2013 08:48:44 +0000 Received: by mail-we0-f169.google.com with SMTP id q58so3291348wes.28 for ; Fri, 15 Nov 2013 00:48:20 -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=oQh6K/gxQFvBbHAKY1rCKj/8Q4q6J5XEl6/fG/y46+s=; b=UNZM9P6Oag1mGuFj5nV7YivXkQ44TZ7AZ5GHXw9jonuCSq/mozq29SE4mgbJdVamjd mYQAU5/8HaepU1gGk6SFc1OHJs6thP9xG+TDJjEBh1jaq1gVcnC7NC0H+mlSMSUra9SE b27SDgoMZOAUxBlKoAPfHaDBdiqZw3KyS5Fc17XtUxH3c+/QNVRAmkZvBmONjy9UaA9n V9m1G/KhDYWzxS+Q5B0GoDiLKMGAxNC+7K8AFmKyep21pvaxW9cp/Rk7vmBwixIgRyf9 NgjR6VUHY3JMWM8bjuWTr8t4biF6fhT/ulh9BAsMORh2B1h1JevSgHQu2EgWSzUmMAYb NOVg== X-Received: by 10.194.23.73 with SMTP id k9mr6089819wjf.24.1384505300448; Fri, 15 Nov 2013 00:48:20 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id qc10sm2856890wic.9.2013.11.15.00.48.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2013 00:48:19 -0800 (PST) From: Dmitry Eremin-Solenikov To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org Subject: [PATCH 2/9] ARM: locomo: don't clobber chip data for chained irq Date: Fri, 15 Nov 2013 12:47:53 +0400 Message-Id: <1384505280-25389-3-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1384505280-25389-1-git-send-email-dbaryshkov@gmail.com> References: <1384505280-25389-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131115_034843_414581_583CB923 X-CRM114-Status: GOOD ( 13.26 ) X-Spam-Score: 0.5 (/) 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=-1.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no 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_* */