From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754299AbbGMU7w (ORCPT ); Mon, 13 Jul 2015 16:59:52 -0400 Received: from www.linutronix.de ([62.245.132.108]:55893 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753660AbbGMUoy (ORCPT ); Mon, 13 Jul 2015 16:44:54 -0400 Message-Id: <20150712225929.502560983@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 13 Jul 2015 20:44:46 -0000 From: Thomas Gleixner To: LKML Cc: Jiang Liu , Lee Jones , Samuel Ortiz , Russell King , Julia Lawall Subject: [patch 1/9] mfd/ezx-pcap: Consolidate chained IRQ handler install/remove References: <20150712225758.573960291@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=mfd-ezx-pcap-Consolidate-chained-IRQ-handler-install.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: Samuel Ortiz Cc: Lee Jones --- drivers/mfd/ezx-pcap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Index: tip/drivers/mfd/ezx-pcap.c =================================================================== --- tip.orig/drivers/mfd/ezx-pcap.c +++ tip/drivers/mfd/ezx-pcap.c @@ -476,8 +476,7 @@ static int ezx_pcap_probe(struct spi_dev pcap->msr = PCAP_MASK_ALL_INTERRUPT; irq_set_irq_type(spi->irq, IRQ_TYPE_EDGE_RISING); - irq_set_handler_data(spi->irq, pcap); - irq_set_chained_handler(spi->irq, pcap_irq_handler); + irq_set_chained_handler_and_data(spi->irq, pcap_irq_handler, pcap); irq_set_irq_wake(spi->irq, 1); /* ADC */