Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e84aa44 authored by Jiang Liu's avatar Jiang Liu Committed by Lee Jones
Browse files

mfd: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc 



Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we
already have a pointer to corresponding irq_desc.

Do the same change to avoid the pattern "irq_get_chip_data(data->irq)".

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 079140f5

drivers/mfd/ezx-pcap.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static void pcap_isr_work(struct work_struct *work) 


static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)

{

	struct pcap_chip *pcap = irq_get_handler_data(irq);

	struct pcap_chip *pcap = irq_desc_get_handler_data(desc);



	desc->irq_data.chip->irq_ack(&desc->irq_data);

	queue_work(pcap->workqueue, &pcap->isr_work);

drivers/mfd/max8997-irq.c

+4 −4
Original line number Diff line number Diff line
@@ -113,14 +113,14 @@ static const struct max8997_irq_data max8997_irqs[] = { 


static void max8997_irq_lock(struct irq_data *data)

{

	struct max8997_dev *max8997 = irq_get_chip_data(data->irq);

	struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);



	mutex_lock(&max8997->irqlock);

}



static void max8997_irq_sync_unlock(struct irq_data *data)

{

	struct max8997_dev *max8997 = irq_get_chip_data(data->irq);

	struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);

	int i;



	for (i = 0; i < MAX8997_IRQ_GROUP_NR; i++) {
@@ -148,7 +148,7 @@ irq_to_max8997_irq(struct max8997_dev *max8997, int irq) 


static void max8997_irq_mask(struct irq_data *data)

{

	struct max8997_dev *max8997 = irq_get_chip_data(data->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);
@@ -157,7 +157,7 @@ static void max8997_irq_mask(struct irq_data *data) 


static void max8997_irq_unmask(struct irq_data *data)

{

	struct max8997_dev *max8997 = irq_get_chip_data(data->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);

drivers/mfd/mt6397-core.c

+4 −4
Original line number Diff line number Diff line
@@ -60,14 +60,14 @@ static const struct mfd_cell mt6397_devs[] = { 


static void mt6397_irq_lock(struct irq_data *data)

{

	struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);

	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);



	mutex_lock(&mt6397->irqlock);

}



static void mt6397_irq_sync_unlock(struct irq_data *data)

{

	struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);

	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);



	regmap_write(mt6397->regmap, MT6397_INT_CON0, mt6397->irq_masks_cur[0]);

	regmap_write(mt6397->regmap, MT6397_INT_CON1, mt6397->irq_masks_cur[1]);
@@ -77,7 +77,7 @@ static void mt6397_irq_sync_unlock(struct irq_data *data) 


static void mt6397_irq_disable(struct irq_data *data)

{

	struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);

	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);

	int shift = data->hwirq & 0xf;

	int reg = data->hwirq >> 4;
@@ -86,7 +86,7 @@ static void mt6397_irq_disable(struct irq_data *data) 


static void mt6397_irq_enable(struct irq_data *data)

{

	struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);

	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);

	int shift = data->hwirq & 0xf;

	int reg = data->hwirq >> 4;

drivers/mfd/t7l66xb.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static struct mfd_cell t7l66xb_cells[] = { 
/* Handle the T7L66XB interrupt mux */

static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc)

{

	struct t7l66xb *t7l66xb = irq_get_handler_data(irq);

	struct t7l66xb *t7l66xb = irq_desc_get_handler_data(desc);

	unsigned int isr;

	unsigned int i, irq_base;

drivers/mfd/tc6393xb.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int tc6393xb_register_gpio(struct tc6393xb *tc6393xb, int gpio_base) 
static void

tc6393xb_irq(unsigned int irq, struct irq_desc *desc)

{

	struct tc6393xb *tc6393xb = irq_get_handler_data(irq);

	struct tc6393xb *tc6393xb = irq_desc_get_handler_data(desc);

	unsigned int isr;

	unsigned int i, irq_base;