From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754771AbbG0P7S (ORCPT ); Mon, 27 Jul 2015 11:59:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36239 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752831AbbG0P7P (ORCPT ); Mon, 27 Jul 2015 11:59:15 -0400 Date: Mon, 27 Jul 2015 08:59:04 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: lee.jones@linaro.org, jiang.liu@linux.intel.com, tglx@linutronix.de, mingo@kernel.org, sameo@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, tglx@linutronix.de, lee.jones@linaro.org, jiang.liu@linux.intel.com, linux-kernel@vger.kernel.org, sameo@linux.intel.com, hpa@zytor.com In-Reply-To: <20150712225930.155347885@linutronix.de> References: <20150712225930.155347885@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] mfd/max899x: Avoid redundant irq_data lookup Git-Commit-ID: 639fd5036c01f16e95a2d0aac91385ae9b528754 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: 639fd5036c01f16e95a2d0aac91385ae9b528754 Gitweb: http://git.kernel.org/tip/639fd5036c01f16e95a2d0aac91385ae9b528754 Author: Thomas Gleixner AuthorDate: Mon, 13 Jul 2015 20:44:59 +0000 Committer: Thomas Gleixner CommitDate: Mon, 27 Jul 2015 13:36:38 +0200 mfd/max899x: Avoid redundant irq_data lookup 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: Jiang Liu Cc: Lee Jones Cc: Samuel Ortiz Link: http://lkml.kernel.org/r/20150712225930.155347885@linutronix.de Signed-off-by: Thomas Gleixner --- drivers/mfd/max8997-irq.c | 7 +++---- drivers/mfd/max8998-irq.c | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/mfd/max8997-irq.c b/drivers/mfd/max8997-irq.c index 26ae51a..17801b5 100644 --- a/drivers/mfd/max8997-irq.c +++ b/drivers/mfd/max8997-irq.c @@ -140,9 +140,8 @@ static void max8997_irq_sync_unlock(struct irq_data *data) } 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_data *data) { 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 irq_data *data) { 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; } diff --git a/drivers/mfd/max8998-irq.c b/drivers/mfd/max8998-irq.c index 3702056..a65e37d 100644 --- a/drivers/mfd/max8998-irq.c +++ b/drivers/mfd/max8998-irq.c @@ -98,9 +98,8 @@ static struct max8998_irq_data max8998_irqs[] = { }; 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(struct irq_data *data) 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 irq_data *data) 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; }