From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753952AbbGMUpJ (ORCPT ); Mon, 13 Jul 2015 16:45:09 -0400 Received: from www.linutronix.de ([62.245.132.108]:55947 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753887AbbGMUpG (ORCPT ); Mon, 13 Jul 2015 16:45:06 -0400 Message-Id: <20150712225930.155347885@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 13 Jul 2015 20:44:59 -0000 From: Thomas Gleixner To: LKML Cc: Jiang Liu , Lee Jones , Samuel Ortiz Subject: [patch 9/9] mfd/max899x: Avoid redundant irq_data lookup References: <20150712225758.573960291@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=mfd-max899x-Avoid-redundant-irq-descriptor-lookup.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 It's pretty silly to do irq_data *d = irq_get_irq_data(irq_data->irq); because that results in d = irq_data, but goes through a lookup of the irq_data. Use irq_data directly. Signed-off-by: Thomas Gleixner Cc: Lee Jones Cc: Jiang Liu Cc: Samuel Ortiz --- drivers/mfd/max8997-irq.c | 7 +++---- drivers/mfd/max8998-irq.c | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-) Index: tip/drivers/mfd/max8997-irq.c =================================================================== --- tip.orig/drivers/mfd/max8997-irq.c +++ tip/drivers/mfd/max8997-irq.c @@ -140,9 +140,8 @@ static void max8997_irq_sync_unlock(stru } static const inline struct max8997_irq_data * -irq_to_max8997_irq(struct max8997_dev *max8997, int irq) +irq_to_max8997_irq(struct max8997_dev *max8997, struct irq_data *data) { - struct irq_data *data = irq_get_irq_data(irq); return &max8997_irqs[data->hwirq]; } @@ -150,7 +149,7 @@ static void max8997_irq_mask(struct irq_ { struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data); const struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997, - data->irq); + data); max8997->irq_masks_cur[irq_data->group] |= irq_data->mask; } @@ -159,7 +158,7 @@ static void max8997_irq_unmask(struct ir { struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data); const struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997, - data->irq); + data); max8997->irq_masks_cur[irq_data->group] &= ~irq_data->mask; } Index: tip/drivers/mfd/max8998-irq.c =================================================================== --- tip.orig/drivers/mfd/max8998-irq.c +++ tip/drivers/mfd/max8998-irq.c @@ -98,9 +98,8 @@ static struct max8998_irq_data max8998_i }; static inline struct max8998_irq_data * -irq_to_max8998_irq(struct max8998_dev *max8998, int irq) +irq_to_max8998_irq(struct max8998_dev *max8998, struct irq_data *data) { - struct irq_data *data = irq_get_irq_data(irq); return &max8998_irqs[data->hwirq]; } @@ -134,8 +133,7 @@ static void max8998_irq_sync_unlock(stru static void max8998_irq_unmask(struct irq_data *data) { struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data); - struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, - data->irq); + struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, data); max8998->irq_masks_cur[irq_data->reg - 1] &= ~irq_data->mask; } @@ -143,8 +141,7 @@ static void max8998_irq_unmask(struct ir static void max8998_irq_mask(struct irq_data *data) { struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data); - struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, - data->irq); + struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, data); max8998->irq_masks_cur[irq_data->reg - 1] |= irq_data->mask; }