From: Mike Rapoport <mike@compulab.co.il>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
linux-kernel@vger.kernel.org, Paul Mundt <lethal@linux-sh.org>
Subject: Re: [PATCH] mfd: Convert tps6586x driver to new irq_ API
Date: Mon, 13 Dec 2010 08:10:58 +0200 [thread overview]
Message-ID: <4D05B8F2.1050608@compulab.co.il> (raw)
In-Reply-To: <1292157568-23220-1-git-send-email-broonie@opensource.wolfsonmicro.com>
On 12/12/10 14:39, Mark Brown wrote:
> 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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Mike Rapoport <mike@compulab.co.il>
> ---
> drivers/mfd/tps6586x.c | 28 ++++++++++++++--------------
> 1 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
> index b4931ab..fe443d7 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 *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++) {
> @@ -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.
prev parent reply other threads:[~2010-12-13 6:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-12 12:39 [PATCH] mfd: Convert tps6586x driver to new irq_ API Mark Brown
2010-12-13 6:10 ` Mike Rapoport [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D05B8F2.1050608@compulab.co.il \
--to=mike@compulab.co.il \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox