From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Samuel Ortiz <sameo@linux•intel.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sundar Iyer <sundar.iyer@stericsson•com>,
Mark Brown <broonie@opensource•wolfsonmicro.com>,
Linus Walleij <linus.walleij@linaro•org>
Subject: linux-next: manual merge of the mfd tree with the ux500-core tree
Date: Mon, 20 Dec 2010 15:21:48 +1100 [thread overview]
Message-ID: <20101220152148.6fedee0d.sfr@canb.auug.org.au> (raw)
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/tc35892.c between commit
f4e8afdc7ab1b5a0962be02a9dd15d29a81f4c53 ("mfd/tc35892: rename tc35892
core driver to tc3589x") from the ux500-core tree and commit
9716d7717db1eb7b407e67e576a8ca515836d0da ("mfd: Convert tc35892 to new
irq_ APIs") from the mfd tree.
The former renamed the file modified by the latter. I have applied the
patch from the mfd tree to the new file drivers/mfd/tc3589x.c (see below).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
From: Mark Brown <broonie@opensource•wolfsonmicro.com>
Date: Sun, 12 Dec 2010 12:26:09 +0000
Subject: [PATCH] mfd: Convert tc35892 to new irq_ APIs
The genirq core is being converted to pass struct irq_data to irq_chip
operations rather than an IRQ number. Update the tc35892 driver to the
new APIs.
Signed-off-by: Mark Brown <broonie@opensource•wolfsonmicro.com>
Acked-by: Rabin Vincent <rabin.vincent@stericsson•com>
Signed-off-by: Samuel Ortiz <sameo@linux•intel.com>
---
drivers/mfd/tc3589x.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index 32291fe..dde2d858 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -170,15 +170,15 @@ again:
return IRQ_HANDLED;
}
-static void tc3589x_irq_dummy(unsigned int irq)
+static void tc3589x_irq_dummy(struct irq_data *data)
{
/* No mask/unmask at this level */
}
static struct irq_chip tc3589x_irq_chip = {
- .name = "tc3589x",
- .mask = tc3589x_irq_dummy,
- .unmask = tc3589x_irq_dummy,
+ .name = "tc3589x",
+ .irq_mask = tc3589x_irq_dummy,
+ .irq_unmask = tc3589x_irq_dummy,
};
static int tc3589x_irq_init(struct tc3589x *tc3589x)
--
1.7.2.3
next reply other threads:[~2010-12-20 4:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-20 4:21 Stephen Rothwell [this message]
2010-12-20 4:23 ` linux-next: manual merge of the mfd tree with the ux500-core tree Paul Mundt
2010-12-20 12:05 ` Samuel Ortiz
2010-12-20 12:12 ` Mark Brown
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=20101220152148.6fedee0d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sameo@linux$(echo .)intel.com \
--cc=sundar.iyer@stericsson$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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