diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-13 22:44:59 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-08-11 16:09:08 +0200 |
| commit | e5ad234485ee868c09f2d59b2ed94d6c6e6d3f19 (patch) | |
| tree | 6513ea1463223704363010649b0d92c7b5297cba | |
| parent | mfd: ucb1x00: Prepare ucb1x00_irq for irq argument removal (diff) | |
| download | linux-e5ad234485ee868c09f2d59b2ed94d6c6e6d3f19.tar.xz linux-e5ad234485ee868c09f2d59b2ed94d6c6e6d3f19.zip | |
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 <tglx@linutronix.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/max8997-irq.c | 7 | ||||
| -rw-r--r-- | 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 03508484b56a..b95a46d79b9d 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 35a077477ce2..90bad9ffa7e2 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; } |