From: Lennert Buytenhek <buytenh@wantstofly.org>
To: Daniel Ribeiro <drwyrm@gmail.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 05/20] mfd: ezx-pcap: irq_data conversion.
Date: Mon, 13 Dec 2010 13:30:09 +0100 [thread overview]
Message-ID: <20101213123009.GO15575@mail.wantstofly.org> (raw)
In-Reply-To: <cover.1292241952.git.buytenh@wantstofly.org>
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
---
drivers/mfd/ezx-pcap.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index c2b698d..601e433 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -144,26 +144,26 @@ int pcap_to_irq(struct pcap_chip *pcap, int irq)
}
EXPORT_SYMBOL_GPL(pcap_to_irq);
-static void pcap_mask_irq(unsigned int irq)
+static void pcap_mask_irq(struct irq_data *d)
{
- struct pcap_chip *pcap = get_irq_chip_data(irq);
+ struct pcap_chip *pcap = irq_data_get_irq_chip_data(d);
- pcap->msr |= 1 << irq_to_pcap(pcap, irq);
+ pcap->msr |= 1 << irq_to_pcap(pcap, d->irq);
queue_work(pcap->workqueue, &pcap->msr_work);
}
-static void pcap_unmask_irq(unsigned int irq)
+static void pcap_unmask_irq(struct irq_data *d)
{
- struct pcap_chip *pcap = get_irq_chip_data(irq);
+ struct pcap_chip *pcap = irq_data_get_irq_chip_data(d);
- pcap->msr &= ~(1 << irq_to_pcap(pcap, irq));
+ pcap->msr &= ~(1 << irq_to_pcap(pcap, d->irq));
queue_work(pcap->workqueue, &pcap->msr_work);
}
static struct irq_chip pcap_irq_chip = {
- .name = "pcap",
- .mask = pcap_mask_irq,
- .unmask = pcap_unmask_irq,
+ .name = "pcap",
+ .irq_mask = pcap_mask_irq,
+ .irq_unmask = pcap_unmask_irq,
};
static void pcap_msr_work(struct work_struct *work)
@@ -218,7 +218,7 @@ static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
{
struct pcap_chip *pcap = get_irq_data(irq);
- desc->chip->ack(irq);
+ desc->irq_data.chip->irq_ack(&desc->irq_data);
queue_work(pcap->workqueue, &pcap->isr_work);
return;
}
--
1.7.1
next prev parent reply other threads:[~2010-12-13 12:30 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 ` Lennert Buytenhek [this message]
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 ` [PATCH 14/20] mfd: tc6393xb: " Lennert Buytenhek
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=20101213123009.GO15575@mail.wantstofly.org \
--to=buytenh@wantstofly.org \
--cc=drwyrm@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®