From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754691AbbG0P63 (ORCPT ); Mon, 27 Jul 2015 11:58:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36198 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753545AbbG0P60 (ORCPT ); Mon, 27 Jul 2015 11:58:26 -0400 Date: Mon, 27 Jul 2015 08:57:09 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, sameo@linux.intel.com, Julia.Lawall@lip6.fr, lee.jones@linaro.org, rmk+kernel@arm.linux.org.uk, jiang.liu@linux.intel.com, hpa@zytor.com Reply-To: jiang.liu@linux.intel.com, hpa@zytor.com, lee.jones@linaro.org, rmk+kernel@arm.linux.org.uk, sameo@linux.intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, Julia.Lawall@lip6.fr In-Reply-To: <20150712225929.659159843@linutronix.de> References: <20150712225929.659159843@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] mfd/jz4740: Consolidate chained IRQ handler install/remove Git-Commit-ID: bcc5909ab8bf644e6d6f15c81c46a0645f110068 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bcc5909ab8bf644e6d6f15c81c46a0645f110068 Gitweb: http://git.kernel.org/tip/bcc5909ab8bf644e6d6f15c81c46a0645f110068 Author: Thomas Gleixner AuthorDate: Mon, 13 Jul 2015 20:44:49 +0000 Committer: Thomas Gleixner CommitDate: Mon, 27 Jul 2015 13:36:37 +0200 mfd/jz4740: Consolidate chained IRQ handler install/remove 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: Jiang Liu Cc: Lee Jones Cc: Samuel Ortiz Cc: Julia Lawall Link: http://lkml.kernel.org/r/20150712225929.659159843@linutronix.de Signed-off-by: Thomas Gleixner --- drivers/mfd/jz4740-adc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c index b31c54e..408291c 100644 --- a/drivers/mfd/jz4740-adc.c +++ b/drivers/mfd/jz4740-adc.c @@ -277,8 +277,7 @@ static int jz4740_adc_probe(struct platform_device *pdev) adc->gc = gc; - irq_set_handler_data(adc->irq, gc); - irq_set_chained_handler(adc->irq, jz4740_adc_irq_demux); + irq_set_chained_handler_and_data(adc->irq, jz4740_adc_irq_demux, gc); writeb(0x00, adc->base + JZ_REG_ADC_ENABLE); writeb(0xff, adc->base + JZ_REG_ADC_CTRL); @@ -308,8 +307,7 @@ static int jz4740_adc_remove(struct platform_device *pdev) irq_remove_generic_chip(adc->gc, IRQ_MSK(5), IRQ_NOPROBE | IRQ_LEVEL, 0); kfree(adc->gc); - irq_set_handler_data(adc->irq, NULL); - irq_set_chained_handler(adc->irq, NULL); + irq_set_chained_handler_and_data(adc->irq, NULL, NULL); iounmap(adc->base); release_mem_region(adc->mem->start, resource_size(adc->mem));