From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754698AbbGMUxm (ORCPT ); Mon, 13 Jul 2015 16:53:42 -0400 Received: from www.linutronix.de ([62.245.132.108]:56377 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753766AbbGMUv3 (ORCPT ); Mon, 13 Jul 2015 16:51:29 -0400 Message-Id: <20150713151626.616384365@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 13 Jul 2015 20:51:22 -0000 From: Thomas Gleixner To: LKML Cc: Jiang Liu , Simon Horman , Magnus Damm Subject: [patch 2/5] sh/irq: Use irq accessor functions instead of open coded access References: <20150713151529.858862519@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=sh-irq-Use-accessor-functions-to-irq_data.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 From: Jiang Liu This is a preparatory patch for refactoring the internals if irq_data. Signed-off-by: Jiang Liu Cc: Simon Horman Cc: Magnus Damm Link: http://lkml.kernel.org/r/1433145945-789-12-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- drivers/sh/intc/virq.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) Index: tip/drivers/sh/intc/virq.c =================================================================== --- tip.orig/drivers/sh/intc/virq.c +++ tip/drivers/sh/intc/virq.c @@ -83,12 +83,11 @@ EXPORT_SYMBOL_GPL(intc_irq_lookup); static int add_virq_to_pirq(unsigned int irq, unsigned int virq) { - struct intc_virq_list **last, *entry; - struct irq_data *data = irq_get_irq_data(irq); + struct intc_virq_list *entry; + struct intc_virq_list **last = NULL; /* scan for duplicates */ - last = (struct intc_virq_list **)&data->handler_data; - for_each_virq(entry, data->handler_data) { + for_each_virq(entry, irq_get_handler_data(irq)) { if (entry->irq == virq) return 0; last = &entry->next; @@ -102,7 +101,10 @@ static int add_virq_to_pirq(unsigned int entry->irq = virq; - *last = entry; + if (last) + *last = entry; + else + irq_set_handler_data(irq, entry); return 0; }