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

Commit 96e824bd authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: Convert tps6586x driver to new irq_ API 



The genirq core is being updated to supply struct irq_data to irq_chip
operations rather than an irq number. Update the tps6586x driver to the
new APIs.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 01af22eb

drivers/mfd/tps6586x.c

+14 −14
Original line number Diff line number Diff line
@@ -323,37 +323,37 @@ static int tps6586x_remove_subdevs(struct tps6586x *tps6586x) 
	return device_for_each_child(tps6586x->dev, NULL, __remove_subdev);

}



static void tps6586x_irq_lock(unsigned int irq)

static void tps6586x_irq_lock(struct irq_data *data)

{

	struct tps6586x *tps6586x = get_irq_chip_data(irq);

	struct tps6586x *tps6586x = irq_data_get_irq_chip_data(data);



	mutex_lock(&tps6586x->irq_lock);

}



static void tps6586x_irq_enable(unsigned int irq)

static void tps6586x_irq_enable(struct irq_data *irq_data)

{

	struct tps6586x *tps6586x = get_irq_chip_data(irq);

	unsigned int __irq = irq - tps6586x->irq_base;

	struct tps6586x *tps6586x = irq_data_get_irq_chip_data(irq_data);

	unsigned int __irq = irq_data->irq - tps6586x->irq_base;

	const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq];



	tps6586x->mask_reg[data->mask_reg] &= ~data->mask_mask;

	tps6586x->irq_en |= (1 << __irq);

}



static void tps6586x_irq_disable(unsigned int irq)

static void tps6586x_irq_disable(struct irq_data *irq_data)

{

	struct tps6586x *tps6586x = get_irq_chip_data(irq);

	struct tps6586x *tps6586x = irq_data_get_irq_chip_data(irq_data);



	unsigned int __irq = irq - tps6586x->irq_base;

	unsigned int __irq = irq_data->irq - tps6586x->irq_base;

	const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq];



	tps6586x->mask_reg[data->mask_reg] |= data->mask_mask;

	tps6586x->irq_en &= ~(1 << __irq);

}



static void tps6586x_irq_sync_unlock(unsigned int irq)

static void tps6586x_irq_sync_unlock(struct irq_data *data)

{

	struct tps6586x *tps6586x = get_irq_chip_data(irq);

	struct tps6586x *tps6586x = irq_data_get_irq_chip_data(data);

	int i;



	for (i = 0; i < ARRAY_SIZE(tps6586x->mask_reg); i++) {
@@ -419,10 +419,10 @@ static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq, 
	tps6586x->irq_base = irq_base;



	tps6586x->irq_chip.name = "tps6586x";

	tps6586x->irq_chip.enable = tps6586x_irq_enable;

	tps6586x->irq_chip.disable = tps6586x_irq_disable;

	tps6586x->irq_chip.bus_lock = tps6586x_irq_lock;

	tps6586x->irq_chip.bus_sync_unlock = tps6586x_irq_sync_unlock;

	tps6586x->irq_chip.irq_enable = tps6586x_irq_enable;

	tps6586x->irq_chip.irq_disable = tps6586x_irq_disable;

	tps6586x->irq_chip.irq_bus_lock = tps6586x_irq_lock;

	tps6586x->irq_chip.irq_bus_sync_unlock = tps6586x_irq_sync_unlock;



	for (i = 0; i < ARRAY_SIZE(tps6586x_irqs); i++) {

		int __irq = i + tps6586x->irq_base;