Messages in this thread | | | Date | Mon, 13 Dec 2010 14:58:08 +0200 | From | Mike Rapoport <> | Subject | Re: [PATCH 15/20] mfd: tps6586x: irq_data conversion. |
| |
On 12/13/10 14:31, Lennert Buytenhek wrote: > Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca> > --- > drivers/mfd/tps6586x.c | 28 ++++++++++++++-------------- > 1 files changed, 14 insertions(+), 14 deletions(-)
Mark Brown has already sent similar patch: :) https://lkml.org/lkml/2010/12/12/51
> diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c > index b4931ab..7f47b6a 100644 > --- a/drivers/mfd/tps6586x.c > +++ b/drivers/mfd/tps6586x.c > @@ -325,37 +325,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 *d) > { > - struct tps6586x *tps6586x = get_irq_chip_data(irq); > + struct tps6586x *tps6586x = irq_data_get_irq_chip_data(d); > > mutex_lock(&tps6586x->irq_lock); > } > > -static void tps6586x_irq_enable(unsigned int irq) > +static void tps6586x_irq_enable(struct irq_data *d) > { > - struct tps6586x *tps6586x = get_irq_chip_data(irq); > - unsigned int __irq = irq - tps6586x->irq_base; > + struct tps6586x *tps6586x = irq_data_get_irq_chip_data(d); > + unsigned int __irq = d->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 *d) > { > - struct tps6586x *tps6586x = get_irq_chip_data(irq); > + struct tps6586x *tps6586x = irq_data_get_irq_chip_data(d); > > - unsigned int __irq = irq - tps6586x->irq_base; > + unsigned int __irq = d->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 *d) > { > - struct tps6586x *tps6586x = get_irq_chip_data(irq); > + struct tps6586x *tps6586x = irq_data_get_irq_chip_data(d); > int i; > > for (i = 0; i < ARRAY_SIZE(tps6586x->mask_reg); i++) { > @@ -421,10 +421,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;
-- Sincerely yours, Mike.
| |