From b6799706f6e55b737e4affe2c590d5c2dfdbfc76 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Fri, 23 Nov 2012 15:19:29 +0000
Subject: [PATCH] --- yaml --- r: 345035 b: refs/heads/master c:
 b20a43715e675815d0a426f05a7607ba099136aa h: refs/heads/master i:   345033:
 8b2172b97d166a9697d4c5991ec2b92f76846128   345031:
 9b4666a1054dd107ba93f45e9a3c6d192e33d93f v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/mfd/stmpe.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index fa6ed356e09b..d9a379c47ad8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f9be35bd9090eaa2f68ed9b24efdbf3abcf4b28
+refs/heads/master: b20a43715e675815d0a426f05a7607ba099136aa
diff --git a/trunk/drivers/mfd/stmpe.c b/trunk/drivers/mfd/stmpe.c
index c0df4b9d51c3..0061d1bc9719 100644
--- a/trunk/drivers/mfd/stmpe.c
+++ b/trunk/drivers/mfd/stmpe.c
@@ -888,18 +888,14 @@ static struct irq_domain_ops stmpe_irq_ops = {
 static int __devinit stmpe_irq_init(struct stmpe *stmpe,
 				struct device_node *np)
 {
-	int base = stmpe->irq_base;
+	int base = 0;
 	int num_irqs = stmpe->variant->num_irqs;
 
-	if (base) {
-		stmpe->domain = irq_domain_add_legacy(
-			np, num_irqs, base, 0, &stmpe_irq_ops, stmpe);
-	}
-	else {
-		stmpe->domain = irq_domain_add_linear(
-			np, num_irqs, &stmpe_irq_ops, stmpe);
-	}
+	if (!np)
+		base = stmpe->irq_base;
 
+	stmpe->domain = irq_domain_add_simple(np, num_irqs, base,
+					      &stmpe_irq_ops, stmpe);
 	if (!stmpe->domain) {
 		dev_err(stmpe->dev, "Failed to create irqdomain\n");
 		return -ENOSYS;