Skip to content

Commit

Permalink
mfd: max899x: Avoid redundant irq_data lookup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
KAGA-KOKO authored and Lee Jones committed Aug 11, 2015
1 parent 0d674d9 commit e5ad234
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
7 changes: 3 additions & 4 deletions drivers/mfd/max8997-irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,16 @@ 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];
}

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;
}
Expand All @@ -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;
}
Expand Down
9 changes: 3 additions & 6 deletions drivers/mfd/max8998-irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}

Expand Down Expand Up @@ -134,17 +133,15 @@ 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;
}

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;
}
Expand Down

0 comments on commit e5ad234

Please sign in to comment.