From: Lennert Buytenhek <buytenh@wantstofly.org>
To: Dmitry Baryshkov <dbaryshkov@gmail.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 14/20] mfd: tc6393xb: irq_data conversion.
Date: Mon, 13 Dec 2010 13:31:10 +0100 [thread overview]
Message-ID: <20101213123110.GX15575@mail.wantstofly.org> (raw)
In-Reply-To: <cover.1292241952.git.buytenh@wantstofly.org>
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
---
drivers/mfd/tc6393xb.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 1ea80d8..e150d91 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -527,41 +527,41 @@ tc6393xb_irq(unsigned int irq, struct irq_desc *desc)
}
}
-static void tc6393xb_irq_ack(unsigned int irq)
+static void tc6393xb_irq_ack(struct irq_data *d)
{
}
-static void tc6393xb_irq_mask(unsigned int irq)
+static void tc6393xb_irq_mask(struct irq_data *d)
{
- struct tc6393xb *tc6393xb = get_irq_chip_data(irq);
+ struct tc6393xb *tc6393xb = irq_data_get_irq_chip_data(d);
unsigned long flags;
u8 imr;
spin_lock_irqsave(&tc6393xb->lock, flags);
imr = tmio_ioread8(tc6393xb->scr + SCR_IMR);
- imr |= 1 << (irq - tc6393xb->irq_base);
+ imr |= 1 << (d->irq - tc6393xb->irq_base);
tmio_iowrite8(imr, tc6393xb->scr + SCR_IMR);
spin_unlock_irqrestore(&tc6393xb->lock, flags);
}
-static void tc6393xb_irq_unmask(unsigned int irq)
+static void tc6393xb_irq_unmask(struct irq_data *d)
{
- struct tc6393xb *tc6393xb = get_irq_chip_data(irq);
+ struct tc6393xb *tc6393xb = irq_data_get_irq_chip_data(d);
unsigned long flags;
u8 imr;
spin_lock_irqsave(&tc6393xb->lock, flags);
imr = tmio_ioread8(tc6393xb->scr + SCR_IMR);
- imr &= ~(1 << (irq - tc6393xb->irq_base));
+ imr &= ~(1 << (d->irq - tc6393xb->irq_base));
tmio_iowrite8(imr, tc6393xb->scr + SCR_IMR);
spin_unlock_irqrestore(&tc6393xb->lock, flags);
}
static struct irq_chip tc6393xb_chip = {
- .name = "tc6393xb",
- .ack = tc6393xb_irq_ack,
- .mask = tc6393xb_irq_mask,
- .unmask = tc6393xb_irq_unmask,
+ .name = "tc6393xb",
+ .irq_ack = tc6393xb_irq_ack,
+ .irq_mask = tc6393xb_irq_mask,
+ .irq_unmask = tc6393xb_irq_unmask,
};
static void tc6393xb_attach_irq(struct platform_device *dev)
--
1.7.1
next prev parent reply other threads:[~2010-12-13 12:32 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1292241952.git.buytenh@wantstofly.org>
2010-12-13 12:29 ` [PATCH 01/20] mfd: 88pm860x-core: " Lennert Buytenhek
2010-12-13 12:29 ` [PATCH 02/20] mfd: ab3550: " Lennert Buytenhek
2010-12-13 12:29 ` [PATCH 03/20] mfd: ab8500: " Lennert Buytenhek
2010-12-13 12:30 ` [PATCH 04/20] mfd: asic3: " Lennert Buytenhek
2010-12-13 12:30 ` [PATCH 05/20] mfd: ezx-pcap: " Lennert Buytenhek
2010-12-13 12:30 ` [PATCH 06/20] mfd: htc-egpio: " Lennert Buytenhek
2010-12-13 12:30 ` [PATCH 07/20] mfd: htc-i2cpld: " Lennert Buytenhek
2010-12-13 12:30 ` [PATCH 08/20] mfd: jz4740-adc: " Lennert Buytenhek
2010-12-13 20:45 ` Lars-Peter Clausen
2010-12-13 12:30 ` [PATCH 09/20] mfd: max8925: " Lennert Buytenhek
2010-12-13 12:30 ` [PATCH 10/20] mfd: max8998: " Lennert Buytenhek
2010-12-14 0:24 ` Kyungmin Park
2010-12-13 12:31 ` [PATCH 11/20] mfd: stmpe: " Lennert Buytenhek
2010-12-14 4:58 ` Rabin Vincent
2010-12-13 12:31 ` [PATCH 12/20] mfd: t7l66xb: " Lennert Buytenhek
2010-12-13 12:31 ` [PATCH 13/20] mfd: tc35892: " Lennert Buytenhek
2010-12-13 12:31 ` Lennert Buytenhek [this message]
2010-12-13 12:31 ` [PATCH 15/20] mfd: tps6586x: " Lennert Buytenhek
2010-12-13 12:58 ` Mike Rapoport
2010-12-13 12:31 ` [PATCH 16/20] mfd: twl4030: " Lennert Buytenhek
2010-12-13 12:31 ` [PATCH 17/20] mfd: twl6030: " Lennert Buytenhek
2010-12-13 12:53 ` Santosh Shilimkar
2010-12-20 1:04 ` Samuel Ortiz
2010-12-13 12:31 ` [PATCH 18/20] mfd: wm831x: " Lennert Buytenhek
2010-12-13 12:39 ` Mark Brown
2010-12-14 9:15 ` Lennert Buytenhek
2010-12-20 0:33 ` Samuel Ortiz
2010-12-13 12:31 ` [PATCH 19/20] mfd: wm8350: " Lennert Buytenhek
2010-12-13 12:31 ` [PATCH 20/20] mfd: wm8994: " Lennert Buytenhek
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=20101213123110.GX15575@mail.wantstofly.org \
--to=buytenh@wantstofly.org \
--cc=dbaryshkov@gmail.com \
--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
all inboxes | Powered by JetHome®