From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753286AbbGMUis (ORCPT ); Mon, 13 Jul 2015 16:38:48 -0400 Received: from www.linutronix.de ([62.245.132.108]:55662 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844AbbGMUir (ORCPT ); Mon, 13 Jul 2015 16:38:47 -0400 Message-Id: <20150713130429.697731509@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 13 Jul 2015 20:38:38 -0000 From: Thomas Gleixner To: LKML Cc: Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org, Russell King , Julia Lawall Subject: [patch 1/1] C6X/meagmod-pic: Consolidate chained IRQ handler install/remove MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=C6X-meagmod-pic-Consolidate-chained-IRQ-handler-inst.patch X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001,URIBL_BLOCKED=0.001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one. Search and conversion was done with coccinelle. Reported-by: Russell King Signed-off-by: Thomas Gleixner Cc: Julia Lawall Cc: Mark Salter Cc: Aurelien Jacquiot Cc: linux-c6x-dev@linux-c6x.org --- arch/c6x/platforms/megamod-pic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: tip/arch/c6x/platforms/megamod-pic.c =================================================================== --- tip.orig/arch/c6x/platforms/megamod-pic.c +++ tip/arch/c6x/platforms/megamod-pic.c @@ -282,8 +282,8 @@ static struct megamod_pic * __init init_ soc_writel(~0, &pic->regs->evtmask[i]); soc_writel(~0, &pic->regs->evtclr[i]); - irq_set_handler_data(irq, &cascade_data[i]); - irq_set_chained_handler(irq, megamod_irq_cascade); + irq_set_chained_handler_and_data(irq, megamod_irq_cascade, + &cascade_data[i]); } /* Finally, set up the MUX registers */