From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932107AbbG1IFL (ORCPT <rfc822;w@1wt.eu>);
	Tue, 28 Jul 2015 04:05:11 -0400
Received: from mail-wi0-f176.google.com ([209.85.212.176]:34688 "EHLO
	mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754904AbbG1IFE (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 28 Jul 2015 04:05:04 -0400
Date: Tue, 28 Jul 2015 09:04:59 +0100
From: Lee Jones <lee.jones@linaro.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>, Jiang Liu <jiang.liu@linux.intel.com>,
        Samuel Ortiz <sameo@linux.intel.com>,
        Russell King <rmk+kernel@arm.linux.org.uk>,
        Julia Lawall <Julia.Lawall@lip6.fr>
Subject: Re: [patch 3/9] mfd/jz4740: Consolidate chained IRQ handler
 install/remove
Message-ID: <20150728080459.GD14943@x1>
References: <20150712225758.573960291@linutronix.de>
 <20150712225929.659159843@linutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20150712225929.659159843@linutronix.de>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 13 Jul 2015, Thomas Gleixner wrote:

> 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 <rmk+kernel@arm.linux.org.uk>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Julia Lawall <Julia.Lawall@lip6.fr>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> Cc: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/mfd/jz4740-adc.c |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)

Applied, thanks.

> Index: tip/drivers/mfd/jz4740-adc.c
> ===================================================================
> --- tip.orig/drivers/mfd/jz4740-adc.c
> +++ tip/drivers/mfd/jz4740-adc.c
> @@ -277,8 +277,7 @@ static int jz4740_adc_probe(struct platf
>  
>  	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 plat
>  
>  	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));
> 
> 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog