Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757549Ab0LMM6Q (ORCPT ); Mon, 13 Dec 2010 07:58:16 -0500 Received: from compulab.co.il ([67.18.134.219]:58678 "EHLO compulab.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757384Ab0LMM6P (ORCPT ); Mon, 13 Dec 2010 07:58:15 -0500 Message-ID: <4D061860.9070203@compulab.co.il> Date: Mon, 13 Dec 2010 14:58:08 +0200 From: Mike Rapoport User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20101013 Lightning/1.0b3pre Thunderbird/3.1.3 MIME-Version: 1.0 To: Lennert Buytenhek CC: Samuel Ortiz , linux-kernel@vger.kernel.org, Mark Brown Subject: Re: [PATCH 15/20] mfd: tps6586x: irq_data conversion. References: <20101213123113.GY15575@mail.wantstofly.org> In-Reply-To: <20101213123113.GY15575@mail.wantstofly.org> X-Enigmail-Version: 1.1.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-ACL-Warn: { X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - compulab.site5.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3285 Lines: 86 On 12/13/10 14:31, Lennert Buytenhek wrote: > Signed-off-by: Lennert Buytenhek > --- > 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/